summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergiy Gur'yev <piratfm@ua.fm>2011-11-24 14:53:19 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-11-24 14:53:54 +0100
commit71ef1e494f82be44a0629111f6a80c027f7d3990 (patch)
treec1bbfb5551d325278cea49bb6a9f50c6c32fb49d
parentb55aca6b8b3969e988e24f253b88e22ead80d8ba (diff)
downloadffmpeg-71ef1e494f82be44a0629111f6a80c027f7d3990.tar.gz
Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 32ed7da1350e551ec005b75e482da74f2e93fbb9)
-rw-r--r--libavcodec/libaacplus.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index c8c87be549..a5ededbf39 100644
--- a/libavcodec/libaacplus.c
+++ b/libavcodec/libaacplus.c
@@ -63,9 +63,7 @@ static av_cold int aacPlus_encode_init(AVCodecContext *avctx)
aacplus_cfg->bitRate = avctx->bit_rate;
aacplus_cfg->bandWidth = avctx->cutoff;
- if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
- aacplus_cfg->outputFormat = 0; //raw aac
- }
+ aacplus_cfg->outputFormat = !(avctx->flags & CODEC_FLAG_GLOBAL_HEADER);
aacplus_cfg->inputFormat = AACPLUS_INPUT_16BIT;
if (!aacplusEncSetConfiguration(s->aacplus_handle, aacplus_cfg)) {
av_log(avctx, AV_LOG_ERROR, "libaacplus doesn't support this output format!\n");