diff options
| author | Heesuk Jung <heesuk.jung@lge.com> | 2012-10-12 13:47:22 +0900 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:57:35 +0200 |
| commit | e3301459f691230bea7cebdc95d8fc255026cdeb (patch) | |
| tree | d27c0e8ee9444a99551eed5db6debed25e8f568a /libavformat | |
| parent | 77e6b085a3386d87e1111697d846f21db423ca09 (diff) | |
| download | ffmpeg-e3301459f691230bea7cebdc95d8fc255026cdeb.tar.gz | |
avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755)
In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)
I found additional case(ss=4096) and add condition.
Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index e383245d31..835c36d4e4 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -682,6 +682,7 @@ static int avi_read_header(AVFormatContext *s) ast->dshow_block_align = 0; } if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024 || + st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 4096 && ast->sample_size == 4096 || st->codec->codec_id == AV_CODEC_ID_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152) { av_log(s, AV_LOG_DEBUG, "overriding sample_size\n"); ast->sample_size = 0; |