From fd90c003d29e4de1def462c7d6fd127e9e9d75d2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 1 Mar 2018 22:12:16 +0100 Subject: mp_image: replace rude function with less rude FFmpeg upstream function This is new, thus a dependency bump is required. --- video/mp_image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'video/mp_image.c') diff --git a/video/mp_image.c b/video/mp_image.c index 3511246b5b..108dba6545 100644 --- a/video/mp_image.c +++ b/video/mp_image.c @@ -988,7 +988,8 @@ struct AVFrame *mp_image_to_av_frame(struct mp_image *src) #if LIBAVUTIL_VERSION_MICRO >= 100 if (src->icc_profile) { AVFrameSideData *sd = - ffmpeg_garbage(dst, AV_FRAME_DATA_ICC_PROFILE, new_ref->icc_profile); + av_frame_new_side_data_from_buf(dst, AV_FRAME_DATA_ICC_PROFILE, + new_ref->icc_profile); if (!sd) abort(); new_ref->icc_profile = NULL; @@ -1007,7 +1008,8 @@ struct AVFrame *mp_image_to_av_frame(struct mp_image *src) for (int n = 0; n < new_ref->num_ff_side_data; n++) { struct mp_ff_side_data *mpsd = &new_ref->ff_side_data[n]; if (!av_frame_get_side_data(dst, mpsd->type)) { - AVFrameSideData *sd = ffmpeg_garbage(dst, mpsd->type, mpsd->buf); + AVFrameSideData *sd = av_frame_new_side_data_from_buf(dst, mpsd->type, + mpsd->buf); if (!sd) abort(); mpsd->buf = NULL; -- cgit v1.2.3