summaryrefslogtreecommitdiff
path: root/libavfilter/src_movie.c
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-04 23:39:25 -0400
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-14 10:04:01 -0400
commit6aaac24d72a7da631173209841a3944fcb4a3309 (patch)
tree4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/src_movie.c
parent8ededd583622359062622cf008144a1511d50bbd (diff)
avfilter/all: propagate errors of functions from avfilter/formats
Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Previous version Reviewed-by: Nicolas George <george@nsup.org> Previous version Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Diffstat (limited to 'libavfilter/src_movie.c')
-rw-r--r--libavfilter/src_movie.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index bbdcbc8cd0..0c2ceed316 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -333,7 +333,7 @@ static int movie_query_formats(AVFilterContext *ctx)
MovieContext *movie = ctx->priv;
int list[] = { 0, -1 };
int64_t list64[] = { 0, -1 };
- int i;
+ int i, ret;
for (i = 0; i < ctx->nb_outputs; i++) {
MovieStream *st = &movie->st[i];
@@ -343,16 +343,20 @@ static int movie_query_formats(AVFilterContext *ctx)
switch (c->codec_type) {
case AVMEDIA_TYPE_VIDEO:
list[0] = c->pix_fmt;
- ff_formats_ref(ff_make_format_list(list), &outlink->in_formats);
+ if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->in_formats)) < 0)
+ return ret;
break;
case AVMEDIA_TYPE_AUDIO:
list[0] = c->sample_fmt;
- ff_formats_ref(ff_make_format_list(list), &outlink->in_formats);
+ if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->in_formats)) < 0)
+ return ret;
list[0] = c->sample_rate;
- ff_formats_ref(ff_make_format_list(list), &outlink->in_samplerates);
+ if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->in_samplerates)) < 0)
+ return ret;
list64[0] = c->channel_layout;
- ff_channel_layouts_ref(avfilter_make_format64_list(list64),
- &outlink->in_channel_layouts);
+ if ((ret = ff_channel_layouts_ref(avfilter_make_format64_list(list64),
+ &outlink->in_channel_layouts)) < 0)
+ return ret;
break;
}
}