From b9cebf180b6d0b429dccbffb60243a88b600aca1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 29 Dec 2016 07:37:31 +0100 Subject: Prefix libavcodec CODEC_FLAG_ constants with AV_ The unprefixed versions are silently deprecated. --- common/encode_lavc.c | 2 +- video/decode/vd_lavc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/encode_lavc.c b/common/encode_lavc.c index 7e116e3b0c..ee870a015a 100644 --- a/common/encode_lavc.c +++ b/common/encode_lavc.c @@ -473,7 +473,7 @@ static void encode_2pass_prepare(struct encode_lavc_context *ctx, if (!(*bytebuf = stream_open(buf, ctx->global))) { MP_WARN(ctx, "%s: could not open '%s', " "disabling 2-pass encoding at pass 2\n", prefix, buf); - codec->flags &= ~CODEC_FLAG_PASS2; + codec->flags &= ~AV_CODEC_FLAG_PASS2; set_to_avdictionary(ctx, dictp, "flags", "-pass2"); } else { struct bstr content = stream_read_complete(*bytebuf, NULL, diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index cc3bbc86c7..1c6a1fef11 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -518,11 +518,11 @@ static void init_avctx(struct dec_video *vd, const char *decoder, mp_set_avcodec_threads(vd->log, avctx, lavc_param->threads); } - avctx->flags |= lavc_param->bitexact ? CODEC_FLAG_BITEXACT : 0; - avctx->flags2 |= lavc_param->fast ? CODEC_FLAG2_FAST : 0; + avctx->flags |= lavc_param->bitexact ? AV_CODEC_FLAG_BITEXACT : 0; + avctx->flags2 |= lavc_param->fast ? AV_CODEC_FLAG2_FAST : 0; if (lavc_param->show_all) - avctx->flags |= CODEC_FLAG_OUTPUT_CORRUPT; + avctx->flags |= AV_CODEC_FLAG_OUTPUT_CORRUPT; avctx->skip_loop_filter = lavc_param->skip_loop_filter; avctx->skip_idct = lavc_param->skip_idct; -- cgit v1.2.3