[FFmpeg-cvslog] avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Aug 12 03:43:41 2015 +0200| [5f501f066ee29f514655906abcf025a4a1dbf2e1] | committer: Michael Niedermayer

avformat/avidec: Disable AVSTREAM_PARSE_TIMESTAMPS for flac

The flac parser does not support it, its also not needed.

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/avidec.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 0761ebc..d9427f5 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -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")) {