Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

[ffmpeg] / libavcodec / libvo-aacenc.c

diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c
index cdd606813bc5b8c01fc9a7556efcc91fb48240e4..3b7aca73865db36d9dc39619505b4c902b84ddbc 100644 (file)
--- a/libavcodec/libvo-aacenc.c
+++ b/libavcodec/libvo-aacenc.c
@@ -188,7 +188,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 AVCodec ff_libvo_aacenc_encoder = {
     .name           = "libvo_aacenc",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_AAC,
+    .id             = AV_CODEC_ID_AAC,
     .priv_data_size = sizeof(AACContext),
     .init           = aac_encode_init,
     .encode2        = aac_encode_frame,