diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-12 03:11:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-12 03:11:15 +0200 |
| commit | 254ff6e6bf658e8666eab6ff9a9c1fa48b7595bd (patch) | |
| tree | 395df8210dbd81394ed0d8e73e408d4495434b4b /libavformat | |
| parent | 542562e5abdf801f32a3fad199554428aca8083b (diff) | |
| download | ffmpeg-254ff6e6bf658e8666eab6ff9a9c1fa48b7595bd.tar.gz | |
avformat/avidec: Add flac to the dshow_block_align exception list
Fixes Ticket4758
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 42b75c0aee..0761ebc249 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -872,8 +872,9 @@ static int avi_read_header(AVFormatContext *s) st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV; ast->dshow_block_align = 0; } - if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align || - st->codec->codec_id == AV_CODEC_ID_MP2 && ast->dshow_block_align <= 4 && ast->dshow_block_align) { + if (st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align <= 4 && ast->dshow_block_align || + st->codec->codec_id == AV_CODEC_ID_FLAC && ast->dshow_block_align <= 4 && ast->dshow_block_align || + st->codec->codec_id == AV_CODEC_ID_MP2 && ast->dshow_block_align <= 4 && ast->dshow_block_align) { av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align); ast->dshow_block_align = 0; } |