diff options
| author | James Almer <jamrial@gmail.com> | 2018-09-02 19:20:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-09-02 19:20:36 -0300 |
| commit | 2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00 (patch) | |
| tree | 82f4a0be6bf807f3cbdd930844aac86611676d91 /libavcodec/libfdk-aacenc.c | |
| parent | 3eea8edf618079e44719fe059ddd953b21ef1ba9 (diff) | |
| parent | b93026777aada7742583d8c5ab079e9f4dfe9a5d (diff) | |
| download | ffmpeg-streaming-2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00.zip ffmpeg-streaming-2d62e06ff6a9f3dbd78136c1dc4a315a727c6f00.tar.gz | |
Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'
* commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d':
libfdk-aac: Use enum names instead of literal numbers for the output format
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/libfdk-aacenc.c')
| -rw-r--r-- | libavcodec/libfdk-aacenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index d47137b..25d33fe 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -227,7 +227,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) /* Choose bitstream format - if global header is requested, use * raw access units, otherwise use ADTS. */ if ((err = aacEncoder_SetParam(s->handle, AACENC_TRANSMUX, - avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER ? 0 : s->latm ? 10 : 2)) != AACENC_OK) { + avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER ? TT_MP4_RAW : + s->latm ? TT_MP4_LOAS : TT_MP4_ADTS)) != AACENC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to set the transmux format: %s\n", aac_get_error(err)); goto error; |
