diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-12 03:43:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-12 04:03:37 +0200 |
| commit | 5f501f066ee29f514655906abcf025a4a1dbf2e1 (patch) | |
| tree | 556d6f7fb1067fa5ae9917174f3a21346c125fab /libavformat | |
| parent | 254ff6e6bf658e8666eab6ff9a9c1fa48b7595bd (diff) | |
| download | ffmpeg-streaming-5f501f066ee29f514655906abcf025a4a1dbf2e1.zip ffmpeg-streaming-5f501f066ee29f514655906abcf025a4a1dbf2e1.tar.gz | |
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@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 3 |
1 files changed, 3 insertions, 0 deletions
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")) { |
