summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-02-07 17:06:20 +0100
committerwm4 <wm4@nowhere>2017-02-07 17:06:20 +0100
commit6d236bd96ee7fb253ffeedb6ff8e03d52bf8c31e (patch)
tree95d5d160398903bccd18eb3cd01b2cc4ffd9f51d
parent96a45a16af5594900ca94e7d4abb18d1e6d5ed4a (diff)
downloadmpv-6d236bd96ee7fb253ffeedb6ff8e03d52bf8c31e.tar.bz2
mpv-6d236bd96ee7fb253ffeedb6ff8e03d52bf8c31e.tar.xz
mp_image_tool: guard hw downloading against allocation failures
Small oversight, matters for OOM errors.
-rw-r--r--video/mp_image_pool.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c
index d234f517a5..9a848af925 100644
--- a/video/mp_image_pool.c
+++ b/video/mp_image_pool.c
@@ -301,7 +301,7 @@ struct mp_image *mp_image_hw_download(struct mp_image *src,
av_frame_unref(srcav);
dst = mp_image_from_av_frame(dstav);
av_frame_unref(dstav);
- if (res >= 0) {
+ if (res >= 0 && dst) {
mp_image_set_size(dst, src->w, src->h);
mp_image_copy_attributes(dst, src);
} else {