libfdk-aac: Use enum names instead of literal numbers for the output format

Message ID 20180705200604.73310-1-martin@martin.st
State Committed
Commit b93026777aada7742583d8c5ab079e9f4dfe9a5d
Headers show
Series
  • libfdk-aac: Use enum names instead of literal numbers for the output format
Related show

Commit Message

Martin Storsjö July 5, 2018, 8:06 p.m.
---
 libavcodec/libfdk-aacenc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Luca Barbato July 6, 2018, 3:04 p.m. | #1
On 05/07/2018 22:06, Martin Storsjö wrote:
> ---
>  libavcodec/libfdk-aacenc.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
> index 26dfb6dc0b..c340a1e3e0 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;
> 

Ok.

Patch

diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 26dfb6dc0b..c340a1e3e0 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;