RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/avidec: add mp2 to the list of exceptions instead of generally treating dshow_block_align==1 special 

Fixes Ticket4552

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-05-17 01:34:35 +02:00
parent b87dd7f82d
commit 488383afd1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/avidec.c
View File

@ -129,7 +129,7 @@ static inline int get_duration(AVIStream *ast, int len)
{ {
if (ast->sample_size) if (ast->sample_size)
return len; return len;
else if (ast->dshow_block_align > 1) else if (ast->dshow_block_align)
return (len + ast->dshow_block_align - 1) / ast->dshow_block_align; return (len + ast->dshow_block_align - 1) / ast->dshow_block_align;
else else
return 1; return 1;
@ -872,7 +872,8 @@ static int avi_read_header(AVFormatContext *s)
st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV; st->codec->codec_id = AV_CODEC_ID_ADPCM_IMA_AMV;
ast->dshow_block_align = 0; ast->dshow_block_align = 0;
} }
if (st->codec->codec_id == AV_CODEC_ID_AAC && 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_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); av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align);
ast->dshow_block_align = 0; ast->dshow_block_align = 0;
} }