From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 12 Aug 2012 23:41:55 +0000 (+0200)
Subject: riffenc: fix aac
X-Git-Tag: android-x86-4.4-r1~10112
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ed8d827ad043036bfad16aa96e79438b6e617834;p=android-x86%2Fexternal-ffmpeg.git

riffenc: fix aac

Fixes Ticket1435

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

diff --git a/libavformat/riff.c b/libavformat/riff.c
index 580ac689aa..2152c0fbdb 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -483,6 +483,8 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc)
         //blkalign = 144 * enc->bit_rate/enc->sample_rate;
     } else if (enc->codec_id == AV_CODEC_ID_AC3) {
             blkalign = 3840; //maximum bytes per frame
+    } else if (enc->codec_id == AV_CODEC_ID_AAC) {
+            blkalign = 768 * enc->channels; //maximum bytes per frame
     } else if (enc->codec_id == AV_CODEC_ID_G723_1) {
             blkalign = 24;
     } else if (enc->block_align != 0) { /* specified by the codec */