summaryrefslogtreecommitdiffstats
path: root/video/sws_utils.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-01-15 20:10:08 +0100
committerwm4 <wm4@nowhere>2015-01-15 20:10:08 +0100
commitc118d8f6cc9950ef74d6b5c24bc3a3e56c4b7d42 (patch)
tree56f9e96739380c8b03ec425dd42ee7eac18d6fd1 /video/sws_utils.c
parenta6997be61b6449117edf4e5aee0b10206a3bce67 (diff)
downloadmpv-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/sws_utils.c')
-rw-r--r--video/sws_utils.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/video/sws_utils.c b/video/sws_utils.c
index a7fcc0469c..8937799f09 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -268,24 +268,26 @@ int mp_sws_scale(struct mp_sws_context *ctx, struct mp_image *dst,
return 0;
}
-void mp_image_swscale(struct mp_image *dst, struct mp_image *src,
- int my_sws_flags)
+int mp_image_swscale(struct mp_image *dst, struct mp_image *src,
+ int my_sws_flags)
{
struct mp_sws_context *ctx = mp_sws_alloc(NULL);
ctx->flags = my_sws_flags;
- mp_sws_scale(ctx, dst, src);
+ int res = mp_sws_scale(ctx, dst, src);
talloc_free(ctx);
+ return res;
}
-void mp_image_sw_blur_scale(struct mp_image *dst, struct mp_image *src,
- float gblur)
+int mp_image_sw_blur_scale(struct mp_image *dst, struct mp_image *src,
+ float gblur)
{
struct mp_sws_context *ctx = mp_sws_alloc(NULL);
ctx->flags = mp_sws_hq_flags;
ctx->src_filter = sws_getDefaultFilter(gblur, gblur, 0, 0, 0, 0, 0);
ctx->force_reload = true;
- mp_sws_scale(ctx, dst, src);
+ int res = mp_sws_scale(ctx, dst, src);
talloc_free(ctx);
+ return res;
}
int mp_sws_get_vf_equalizer(struct mp_sws_context *sws, struct vf_seteq *eq)