git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b0ca90d
)
avfilter/vf_hwupload_cuda: check ff_formats_ref for errors
author
Timo Rothenpieler
<timo@rothenpieler.org>
Mon, 10 Oct 2016 10:57:29 +0000
(12:57 +0200)
committer
Timo Rothenpieler
<timo@rothenpieler.org>
Tue, 22 Nov 2016 09:34:27 +0000
(10:34 +0100)
libavfilter/vf_hwupload_cuda.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_hwupload_cuda.c
b/libavfilter/vf_hwupload_cuda.c
index
dba496f
..
14688df
100644
(file)
--- a/
libavfilter/vf_hwupload_cuda.c
+++ b/
libavfilter/vf_hwupload_cuda.c
@@
-54,6
+54,8
@@
static av_cold void cudaupload_uninit(AVFilterContext *ctx)
static int cudaupload_query_formats(AVFilterContext *ctx)
{
static int cudaupload_query_formats(AVFilterContext *ctx)
{
+ int ret;
+
static const enum AVPixelFormat input_pix_fmts[] = {
AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE,
static const enum AVPixelFormat input_pix_fmts[] = {
AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV444P,
AV_PIX_FMT_NONE,
@@
-64,8
+66,13
@@
static int cudaupload_query_formats(AVFilterContext *ctx)
AVFilterFormats *in_fmts = ff_make_format_list(input_pix_fmts);
AVFilterFormats *out_fmts = ff_make_format_list(output_pix_fmts);
AVFilterFormats *in_fmts = ff_make_format_list(input_pix_fmts);
AVFilterFormats *out_fmts = ff_make_format_list(output_pix_fmts);
- ff_formats_ref(in_fmts, &ctx->inputs[0]->out_formats);
- ff_formats_ref(out_fmts, &ctx->outputs[0]->in_formats);
+ ret = ff_formats_ref(in_fmts, &ctx->inputs[0]->out_formats);
+ if (ret < 0)
+ return ret;
+
+ ret = ff_formats_ref(out_fmts, &ctx->outputs[0]->in_formats);
+ if (ret < 0)
+ return ret;
return 0;
}
return 0;
}