rtp: Make sure the output format pointer is set

[ffmpeg] / libavcodec / dca_parser.c

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 553e69c41c5d738f6841024d1b13b3060a969adb..ab235cf480873ae8ab2810c0a9ff38304b379cfa 100644 (file)
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -161,7 +161,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
 
     skip_bits(&gb, 20);
     sr_code = get_bits(&gb, 4);
-    *sample_rate = ff_dca_sample_rates[sr_code];
+    *sample_rate = avpriv_dca_sample_rates[sr_code];
     if (*sample_rate == 0)
         return AVERROR_INVALIDDATA;
 
@@ -192,8 +192,7 @@ static int dca_parse(AVCodecParserContext * s,
     /* read the duration and sample rate from the frame header */
     if (!dca_parse_params(buf, buf_size, &duration, &sample_rate)) {
         s->duration = duration;
-        if (!avctx->sample_rate)
-            avctx->sample_rate = sample_rate;
+        avctx->sample_rate = sample_rate;
     } else
         s->duration = 0;
 
@@ -203,7 +202,7 @@ static int dca_parse(AVCodecParserContext * s,
 }
 
 AVCodecParser ff_dca_parser = {
-    .codec_ids      = { CODEC_ID_DTS },
+    .codec_ids      = { AV_CODEC_ID_DTS },
     .priv_data_size = sizeof(DCAParseContext),
     .parser_init    = dca_parse_init,
     .parser_parse   = dca_parse,