[FFmpeg-cvslog] ffmpeg: revert 492cc1

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 14 15:15:11 2012 +0200| [6d49e819beebe8fb7ed5b0c01ed611b13a8f69ce] | committer: Michael Niedermayer

ffmpeg: revert 492cc1

This restores correct block_align values in case of stream copy.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 ffmpeg.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 02efdf4..0bd318a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3076,6 +3076,10 @@ 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)
+                    codec->block_align= 0;
+                if(codec->codec_id == CODEC_ID_AC3)
+                    codec->block_align= 0;
                 break;
             case AVMEDIA_TYPE_VIDEO:
                 codec->pix_fmt            = icodec->pix_fmt;