X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Flibfaac.c;h=d32e77667845b2fef5f6de141eb909b724f67c6b;hb=0e02b381b4850bbc5b8e1ce6e17447968a2ae8b5;hp=50860f2967d2bf8299ba00004bcd9bf7270fb3b0;hpb=0177b7d23aadeab218601893953f0a05209d037c;p=ffmpeg

diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 50860f2967d..d32e7766784 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -26,10 +26,11 @@
 
 #include <faac.h>
 
+#include "libavutil/channel_layout.h"
+#include "libavutil/common.h"
 #include "avcodec.h"
 #include "audio_frame_queue.h"
 #include "internal.h"
-#include "libavutil/audioconvert.h"
 
 
 /* libfaac has an encoder delay of 1024 samples */
@@ -158,9 +159,7 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
             memcpy(avctx->extradata, buffer, avctx->extradata_size);
             faac_cfg->outputFormat = 0;
         }
-#undef free
         free(buffer);
-#define free please_use_av_free
     }
 
     if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
@@ -201,7 +200,7 @@ static int Faac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 
     /* add current frame to the queue */
     if (frame) {
-        if ((ret = ff_af_queue_add(&s->afq, frame) < 0))
+        if ((ret = ff_af_queue_add(&s->afq, frame)) < 0)
             return ret;
     }
 
@@ -238,7 +237,7 @@ static const uint64_t faac_channel_layouts[] = {
 AVCodec ff_libfaac_encoder = {
     .name           = "libfaac",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_AAC,
+    .id             = AV_CODEC_ID_AAC,
     .priv_data_size = sizeof(FaacAudioContext),
     .init           = Faac_encode_init,
     .encode2        = Faac_encode_frame,