[FFmpeg-cvslog] Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.c

Sergiy Gur'yev git at videolan.org
Sun Dec 25 20:09:42 CET 2011


ffmpeg | branch: release/0.7 | Sergiy Gur'yev <piratfm at ua.fm> | Thu Nov 24 14:53:19 2011 +0200| [4f58d8ebc1a75f85495e846941d3893508449f16] | committer: Carl Eugen Hoyos

Fix adts format creation in aac+ encoder modified: libavcodec/libaacplus.c

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 32ed7da1350e551ec005b75e482da74f2e93fbb9)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4f58d8ebc1a75f85495e846941d3893508449f16
---

 libavcodec/libaacplus.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libaacplus.c b/libavcodec/libaacplus.c
index c8c87be..a5ededb 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");



More information about the ffmpeg-cvslog mailing list