Merge commit 'c060d046aa2f89c0e601a2dcfbce53f0e36cf498'

[ffmpeg] / libavformat / riffenc.c

diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c
index d429df0ba3ae265f0489d4835bd990f9ce8a413b..85c953f2efe685f60029c53979a7bce1f28e016d 100644 (file)
--- a/libavformat/riffenc.c
+++ b/libavformat/riffenc.c
@@ -103,7 +103,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags)
     }
 
     if (enc->codec_id == AV_CODEC_ID_MP2) {
-        blkalign = frame_size;
+        blkalign = (144 * enc->bit_rate - 1)/enc->sample_rate + 1;
     } else if (enc->codec_id == AV_CODEC_ID_MP3) {
         blkalign = 576 * (enc->sample_rate <= (24000 + 32000)/2 ? 1 : 2);
     } else if (enc->codec_id == AV_CODEC_ID_AC3) {