]> git.sesse.net Git - ffmpeg/commitdiff
avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 12 Aug 2015 01:43:41 +0000 (03:43 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 12 Aug 2015 02:03:37 +0000 (04:03 +0200)
The flac parser does not support it, its also not needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/avidec.c

index 0761ebc249a2ce606e47b40067d0383389fd335b..d9427f543b3dc60d86bcc5f0f7b0d23fb2696f1e 100644 (file)
@@ -861,6 +861,9 @@ static int avi_read_header(AVFormatContext *s)
                     if (st->codec->codec_id == AV_CODEC_ID_AAC &&
                         st->codec->extradata_size)
                         st->need_parsing = AVSTREAM_PARSE_NONE;
+                    // The flac parser does not work with AVSTREAM_PARSE_TIMESTAMPS
+                    if (st->codec->codec_id == AV_CODEC_ID_FLAC)
+                        st->need_parsing = AVSTREAM_PARSE_NONE;
                     /* AVI files with Xan DPCM audio (wrongly) declare PCM
                      * audio in the header but have Axan as stream_code_tag. */
                     if (ast->handler == AV_RL32("Axan")) {