[FFmpeg-cvslog] dca_parser: don't overwrite the sample rate, it may not be correct

Hendrik Leppkes git at videolan.org
Tue Oct 20 13:06:49 CEST 2015


ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Wed Sep 30 13:09:01 2015 +0200| [00ae5b401b24592a9f7019baada5b349152ee2fc] | committer: Hendrik Leppkes

dca_parser: don't overwrite the sample rate, it may not be correct

The parser only reads the dca core sample rate, which is limited to a
maximum of 48000 Hz, while X96 and HD extensions can increase the sample
rate up to 192000 Hz.

This change prevents the parser and decoder fighting over the sample rate,
potentially confusing user applications. This also fixes sample rate
display of >48000Hz files with ffmpeg/ffprobe when using libdcadec.

Fixes ticket #4397

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=00ae5b401b24592a9f7019baada5b349152ee2fc
---

 libavcodec/dca_parser.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/dca_parser.c b/libavcodec/dca_parser.c
index 337a99d..70e64a8 100644
--- a/libavcodec/dca_parser.c
+++ b/libavcodec/dca_parser.c
@@ -166,7 +166,6 @@ static int dca_parse(AVCodecParserContext *s, AVCodecContext *avctx,
     /* read the duration and sample rate from the frame header */
     if (!dca_parse_params(buf, buf_size, &duration, &sample_rate, &pc1->framesize)) {
         s->duration        = duration;
-        avctx->sample_rate = sample_rate;
     } else
         s->duration = 0;
 



More information about the ffmpeg-cvslog mailing list