[FFmpeg-cvslog] Fix broken timestamps for some mp3 in avi samples.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Oct 10 23:59:43 2012 +0200| [1a104bf641b1f5e278dd1cbf29853921785aa797] | committer: Carl Eugen Hoyos

Fix broken timestamps for some mp3 in avi samples.

Mostly based on 73ad355 by Michael Niedermayer.
Fixes ticket #606.

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

 libavformat/avidec.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 8f548eb..e383245 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -681,7 +681,8 @@ static int avi_read_header(AVFormatContext *s)
                         av_log(s, AV_LOG_DEBUG, "overriding invalid dshow_block_align of %d\n", ast->dshow_block_align);
                         ast->dshow_block_align = 0;
                     }
-                    if(st->codec->codec_id == AV_CODEC_ID_AAC && ast->dshow_block_align == 1024 && ast->sample_size == 1024) {
+                    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_MP3 && ast->dshow_block_align == 1152 && ast->sample_size == 1152) {
                         av_log(s, AV_LOG_DEBUG, "overriding sample_size\n");
                         ast->sample_size = 0;
                     }