summaryrefslogtreecommitdiffstats
path: root/common/av_common.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-03-01 22:12:16 +0100
committerJan Ekström <jeebjp@gmail.com>2018-03-03 02:38:01 +0200
commitfd90c003d29e4de1def462c7d6fd127e9e9d75d2 (patch)
tree08b666265c8115e7c41b932736893e7cf117c5bf /common/av_common.c
parent14c2f20bffb09452b427cb58d7c792e05f3ca792 (diff)
downloadmpv-fd90c003d29e4de1def462c7d6fd127e9e9d75d2.tar.bz2
mpv-fd90c003d29e4de1def462c7d6fd127e9e9d75d2.tar.xz
mp_image: replace rude function with less rude FFmpeg upstream function
This is new, thus a dependency bump is required.
Diffstat (limited to 'common/av_common.c')
-rw-r--r--common/av_common.c48
1 files changed, 0 insertions, 48 deletions
diff --git a/common/av_common.c b/common/av_common.c
index a76dd37117..00c7d79a74 100644
--- a/common/av_common.c
+++ b/common/av_common.c
@@ -365,51 +365,3 @@ int mp_set_avopts(struct mp_log *log, void *avobj, char **kv)
}
return success;
}
-
-#if LIBAVUTIL_VERSION_MICRO >= 100
-AVFrameSideData *ffmpeg_garbage(AVFrame *frame,
- enum AVFrameSideDataType type,
- AVBufferRef *buf)
-{
- AVFrameSideData *ret, **tmp;
-
- if (!buf)
- return NULL;
-
- if (frame->nb_side_data > INT_MAX / sizeof(*frame->side_data) - 1)
- goto fail;
-
- tmp = av_realloc(frame->side_data,
- (frame->nb_side_data + 1) * sizeof(*frame->side_data));
- if (!tmp)
- goto fail;
- frame->side_data = tmp;
-
- ret = av_mallocz(sizeof(*ret));
- if (!ret)
- goto fail;
-
- ret->buf = buf;
- ret->data = ret->buf->data;
- ret->size = buf->size;
- ret->type = type;
-
- frame->side_data[frame->nb_side_data++] = ret;
-
- return ret;
-fail:
- av_buffer_unref(&buf);
- return NULL;
-}
-#else
-AVFrameSideData *ffmpeg_garbage(AVFrame *frame,
- enum AVFrameSideDataType type,
- AVBufferRef *buf)
-{
- AVFrameSideData *sd = av_frame_new_side_data(frame, type, buf->size);
- if (sd)
- memcpy(sd->data, buf->data, buf->size);
- av_buffer_unref(&buf);
- return sd;
-}
-#endif