Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / nellymoserenc.c

diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c
index e3bae11706d8c54c3f7293d51fc320a06ba4746e..2b96d475804f9e4b55c11fdf76f5ad764c6ab9f5 100644 (file)
--- a/libavcodec/nellymoserenc.c
+++ b/libavcodec/nellymoserenc.c
@@ -419,7 +419,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
 AVCodec ff_nellymoser_encoder = {
     .name           = "nellymoser",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_NELLYMOSER,
+    .id             = AV_CODEC_ID_NELLYMOSER,
     .priv_data_size = sizeof(NellyMoserEncodeContext),
     .init           = encode_init,
     .encode2        = encode_frame,