aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-03-13 09:56:50 +0100
committerClément Bœsch <ubitux@gmail.com>2013-03-13 19:00:09 +0100
commit05854f5505f5a8213024265f76e1f52244874be4 (patch)
tree543289966d9ac88693839a2f0614ecbad9276ca9
parentbdbdadbaff6feead6c1bc094004f7bcd370483cc (diff)
downloadffmpeg-05854f5505f5a8213024265f76e1f52244874be4.tar.gz
lavfi/movie: raise filter_frame() error.
-rw-r--r--libavfilter/src_movie.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index decbc0f1c5..455ebe01ef 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -549,9 +549,11 @@ static int movie_push_frame(AVFilterContext *ctx, unsigned out_id)
describe_frameref(movie->frame, outlink));
movie->frame->pts = av_frame_get_best_effort_timestamp(movie->frame);
- ff_filter_frame(outlink, movie->frame); // FIXME: raise error properly
+ ret = ff_filter_frame(outlink, movie->frame);
movie->frame = NULL;
+ if (ret < 0)
+ return ret;
return pkt_out_id == out_id;
}