diff options
author | wm4 <wm4@nowhere> | 2015-01-15 20:10:08 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-01-15 20:10:08 +0100 |
commit | c118d8f6cc9950ef74d6b5c24bc3a3e56c4b7d42 (patch) | |
tree | 56f9e96739380c8b03ec425dd42ee7eac18d6fd1 /video/image_writer.c | |
parent | a6997be61b6449117edf4e5aee0b10206a3bce67 (diff) | |
download | mpv-c118d8f6cc9950ef74d6b5c24bc3a3e56c4b7d42.tar.bz2 mpv-c118d8f6cc9950ef74d6b5c24bc3a3e56c4b7d42.tar.xz |
image_writer: check for conversion errors
This can happen when e.g. a VO returns a screenshot in an unsupported
format.
Diffstat (limited to 'video/image_writer.c')
-rw-r--r-- | video/image_writer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/video/image_writer.c b/video/image_writer.c index 03f164bf91..ff321cfd1f 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -296,7 +296,11 @@ int write_image(struct mp_image *image, const struct image_writer_opts *opts, } mp_image_copy_attributes(dst, image); - mp_image_swscale(dst, image, mp_sws_hq_flags); + if (mp_image_swscale(dst, image, mp_sws_hq_flags) < 0) { + mp_err(log, "Error when converting image.\n"); + talloc_free(dst); + return 0; + } allocated_image = dst; image = dst; |