Rename ff_parse_eval() to ff_eval_expr().

[ffmpeg] / libavcodec / flacenc.c

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index c1f862a68458397c795eb4bd35739052100d81c4..89d40d5ac24fe20eeda779aa77ac7016764bab8b 100644 (file)
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -352,7 +352,7 @@ static av_cold int flac_encode_init(AVCodecContext *avctx)
     /* initialize MD5 context */
     s->md5ctx = av_malloc(av_md5_size);
     if(!s->md5ctx)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     av_md5_init(s->md5ctx);
 
     streaminfo = av_malloc(FLAC_STREAMINFO_SIZE);
@@ -1253,7 +1253,7 @@ static av_cold int flac_encode_close(AVCodecContext *avctx)
 
 AVCodec flac_encoder = {
     "flac",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_FLAC,
     sizeof(FlacEncodeContext),
     flac_encode_init,