diff options
Diffstat (limited to 'video/mp_image.c')
| -rw-r--r-- | video/mp_image.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/video/mp_image.c b/video/mp_image.c index ef2fa488ad..ea04bab26e 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -25,10 +25,7 @@ #include <libavutil/hwcontext.h> #include <libavutil/rational.h> #include <libavcodec/avcodec.h> - -#if LIBAVUTIL_VERSION_MICRO >= 100 #include <libavutil/mastering_display_metadata.h> -#endif #include "mpv_talloc.h" @@ -867,7 +864,6 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src) dst->params.color.light = p->color.light; } -#if LIBAVUTIL_VERSION_MICRO >= 100 sd = av_frame_get_side_data(src, AV_FRAME_DATA_ICC_PROFILE); if (sd) dst->icc_profile = sd->buf; @@ -899,7 +895,6 @@ struct mp_image *mp_image_from_av_frame(struct AVFrame *src) }; MP_TARRAY_APPEND(NULL, dst->ff_side_data, dst->num_ff_side_data, mpsd); } -#endif if (dst->hwctx) { AVHWFramesContext *fctx = (void *)dst->hwctx->data; @@ -968,7 +963,6 @@ struct AVFrame *mp_image_to_av_frame(struct mp_image *src) abort(); *(struct mp_image_params *)dst->opaque_ref->data = src->params; -#if LIBAVUTIL_VERSION_MICRO >= 100 if (src->icc_profile) { AVFrameSideData *sd = av_frame_new_side_data_from_buf(dst, AV_FRAME_DATA_ICC_PROFILE, @@ -998,7 +992,6 @@ struct AVFrame *mp_image_to_av_frame(struct mp_image *src) mpsd->buf = NULL; } } -#endif talloc_free(new_ref); |