[FFmpeg-cvslog] r26167 - trunk/libavformat/riff.c

[cehoyos]

Author: cehoyos
Date: Thu Dec 30 15:21:14 2010
New Revision: 26167

Log:
Set blkalign to maximum framesize to allow playback on WMP (see issue 2455 and issue 2446).

Modified:
   trunk/libavformat/riff.c

Modified: trunk/libavformat/riff.c
==============================================================================
--- trunk/libavformat/riff.c	Thu Dec 30 14:34:31 2010	(r26166)
+++ trunk/libavformat/riff.c	Thu Dec 30 15:21:14 2010	(r26167)
@@ -373,6 +373,10 @@ int ff_put_wav_header(ByteIOContext *pb,
     if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3 || enc->codec_id == CODEC_ID_AC3) {
         blkalign = enc->frame_size; //this is wrong, but it seems many demuxers do not work if this is set correctly
         //blkalign = 144 * enc->bit_rate/enc->sample_rate;
+        //For high bitrate AC-3, set blkalign to maximum bytes per frame value
+        //to allow playback on WMP and MPlayer
+        if (enc->bit_rate > 384000)
+            blkalign = 3840;
     } else if (enc->codec_id == CODEC_ID_ADPCM_G726) { //
         blkalign = 1;
     } else if (enc->block_align != 0) { /* specified by the codec */