OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c0d8bc
)
riffenc: fix aac
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 12 Aug 2012 23:41:55 +0000
(
01:41
+0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 12 Aug 2012 23:41:55 +0000
(
01:41
+0200)
Fixes Ticket1435
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/riff.c
patch
|
blob
|
history
diff --git
a/libavformat/riff.c
b/libavformat/riff.c
index
580ac68
..
2152c0f
100644
(file)
--- 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 */