summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-13 16:24:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-16 16:56:03 +0200
commit5dba4cbc2f3f64b188289804216a737528ced290 (patch)
tree3d7c6a6a689db73f4931d5a62c5b9088ecc97a73 /ffmpeg.c
parentb45a313e97750a498ffb5aaf5391bbf66c23ae59 (diff)
downloadffmpeg-streaming-5dba4cbc2f3f64b188289804216a737528ced290.zip
ffmpeg-streaming-5dba4cbc2f3f64b188289804216a737528ced290.tar.gz
ffmpeg: fix streamcopy of some mp3 in avi
Fixes Ticket1432 Thanks-to: Mike Scheutzow <mike.scheutzow@alcatel-lucent.com> for some of the bug analysis Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud