diff options
| author | wm4 <wm4@nowhere> | 2017-01-24 08:11:42 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-01-24 08:11:42 +0100 |
| commit | b14fac9afa79e44d8b0323c6ddbef1557cdd0d8d (patch) | |
| tree | 676e8e9ef45690491d827b553ec8cc29f49e84f3 /video | |
| parent | 6be58df8d14922bc1f4252f9f69ca9c0d74c331a (diff) | |
| download | mpv-b14fac9afa79e44d8b0323c6ddbef1557cdd0d8d.tar.bz2 mpv-b14fac9afa79e44d8b0323c6ddbef1557cdd0d8d.tar.xz | |
build: replace some FFmpeg API checks with version checks
The FFmpeg versions we support all have the APIs we were checking for.
Only Libav missed them. Simplify this by explicitly checking for FFmpeg
in the code, instead of trying to detect the presence of the API.
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/vd_lavc.c | 4 | ||||
| -rw-r--r-- | video/filter/vf_lavfi.c | 2 | ||||
| -rw-r--r-- | video/sws_utils.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index 19a6336f19..c4cfbc30d3 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -48,7 +48,7 @@ #include "video/csputils.h" #include "video/sws_utils.h" -#if HAVE_AVUTIL_MASTERING_METADATA +#if LIBAVCODEC_VERSION_MICRO >= 100 #include <libavutil/mastering_display_metadata.h> #endif @@ -624,7 +624,7 @@ static void update_image_params(struct dec_video *vd, AVFrame *frame, { vd_ffmpeg_ctx *ctx = vd->priv; -#if HAVE_AVUTIL_MASTERING_METADATA +#if LIBAVCODEC_VERSION_MICRO >= 100 // Get the reference peak (for HDR) if available. This is cached into ctx // when it's found, since it's not available on every frame (and seems to // be only available for keyframes) diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index 2f4bc92ecc..e28d7fbb6f 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -287,7 +287,7 @@ static struct mp_image *av_to_mp(struct vf_instance *vf, AVFrame *av_frame) static void get_metadata_from_av_frame(struct vf_instance *vf, AVFrame *frame) { -#if HAVE_AVFRAME_METADATA +#if LIBAVUTIL_VERSION_MICRO >= 100 struct vf_priv_s *p = vf->priv; if (!p->metadata) p->metadata = talloc_zero(p, struct mp_tags); diff --git a/video/sws_utils.c b/video/sws_utils.c index 45918b19d1..33eae6efa9 100644 --- a/video/sws_utils.c +++ b/video/sws_utils.c @@ -217,7 +217,7 @@ int mp_sws_reinit(struct mp_sws_context *ctx) av_opt_set_double(ctx->sws, "param0", ctx->params[0], 0); av_opt_set_double(ctx->sws, "param1", ctx->params[1], 0); -#if HAVE_AVCODEC_CHROMA_POS_API +#if LIBAVCODEC_VERSION_MICRO >= 100 int cr_src = mp_chroma_location_to_av(src->chroma_location); int cr_dst = mp_chroma_location_to_av(dst->chroma_location); int cr_xpos, cr_ypos; |