summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-07-08 14:48:17 +0200
committerwm4 <wm4@nowhere>2015-07-08 14:48:17 +0200
commitd2c05cb55993b1b7b18f2b6ab92e4397f84d0cd5 (patch)
tree1bc2d70b3e17cbf69b12a6caf2ce0970e9ae5948
parentdb2268d5b11bfd290251b4aac7045535803f4d96 (diff)
downloadmpv-d2c05cb55993b1b7b18f2b6ab92e4397f84d0cd5.tar.bz2
mpv-d2c05cb55993b1b7b18f2b6ab92e4397f84d0cd5.tar.xz
mp_image: fix vf_vdpaupp references
Some code called by vf_vdpaupp.c calls mp_image_new_custom_ref(), but out of convenience doesn't reset the buffers. Make this behavior ok. (The assert() was there to catch usage errors, but the same error could already happen before the refcount changes were made, so the check is not overly helpful.) Fixes #2115.
-rw-r--r--video/mp_image.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/video/mp_image.c b/video/mp_image.c
index 30488e66c2..debdbbb201 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -241,8 +241,6 @@ struct mp_image *mp_image_new_dummy_ref(struct mp_image *img)
struct mp_image *mp_image_new_custom_ref(struct mp_image *img, void *free_arg,
void (*free)(void *arg))
{
- assert(!img->bufs[0]);
-
struct mp_image *new = mp_image_new_dummy_ref(img);
struct free_args *args = talloc_ptrtype(NULL, args);