OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bdbdadb
)
lavfi/movie: raise filter_frame() error.
author
Clément Bœsch
<ubitux@gmail.com>
Wed, 13 Mar 2013 08:56:50 +0000
(09:56 +0100)
committer
Clément Bœsch
<ubitux@gmail.com>
Wed, 13 Mar 2013 18:00:09 +0000
(19:00 +0100)
libavfilter/src_movie.c
patch
|
blob
|
history
diff --git
a/libavfilter/src_movie.c
b/libavfilter/src_movie.c
index
decbc0f
..
455ebe0
100644
(file)
--- 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;
}