[SCM] libav/experimental: fix block_align for mp3 stream copy

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 4efd6f58b64c4b4187ac7ee65162b94106272295
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Fri Aug 3 23:23:42 2007 +0000

    fix block_align for mp3 stream copy
    
    Originally committed as revision 9880 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 8ec10a2..859f3ff 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1527,6 +1527,8 @@ static int av_encode(AVFormatContext **output_files,
                 codec->channels = icodec->channels;
                 codec->frame_size = icodec->frame_size;
                 codec->block_align= icodec->block_align;
+                if(codec->block_align == 1 && codec->codec_id == CODEC_ID_MP3)
+                    codec->block_align= 0;
                 break;
             case CODEC_TYPE_VIDEO:
                 if(using_vhook) {

-- 
Libav/FFmpeg packaging