[FFmpeg-cvslog] avidec: Use sample size in case incorrect timestamps for aac in AVI ( Ticket #1755)

[Heesuk Jung]

ffmpeg | branch: master | Heesuk Jung <heesuk.jung at lge.com> | Fri Oct 12 13:47:22 2012 +0900| [e3301459f691230bea7cebdc95d8fc255026cdeb] | committer: Michael Niedermayer

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 at gmx.at>

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

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

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index e383245..835c36d 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;