[FFmpeg-cvslog] ffmpeg: fix streamcopy of some mp3 in avi

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 13 16:24:54 2012 +0200| [5dba4cbc2f3f64b188289804216a737528ced290] | committer: Michael Niedermayer

ffmpeg: fix streamcopy of some mp3 in avi

Fixes Ticket1432

Thanks-to: Mike Scheutzow <mike.scheutzow at alcatel-lucent.com> for some of the bug analysis
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index f949d48..61840cc 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3006,7 +3006,7 @@ static int transcode_init(void)
                 codec->frame_size         = icodec->frame_size;
                 codec->audio_service_type = icodec->audio_service_type;
                 codec->block_align        = icodec->block_align;
-                if(codec->block_align == 1 && codec->codec_id == CODEC_ID_MP3)
+                if((codec->block_align == 1 || codec->block_align == 1152) && codec->codec_id == CODEC_ID_MP3)
                     codec->block_align= 0;
                 if(codec->codec_id == CODEC_ID_AC3)
                     codec->block_align= 0;