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:
ca540fb
)
lavfi/vf_thumbnail: remove looping on request_frame().
author
Nicolas George
<george@nsup.org>
Fri, 2 Oct 2015 14:19:55 +0000
(16:19 +0200)
committer
Nicolas George
<george@nsup.org>
Wed, 7 Oct 2015 17:05:13 +0000
(19:05 +0200)
libavfilter/vf_thumbnail.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_thumbnail.c
b/libavfilter/vf_thumbnail.c
index
c378791
..
64cedd4
100644
(file)
--- a/
libavfilter/vf_thumbnail.c
+++ b/
libavfilter/vf_thumbnail.c
@@
-172,9
+172,7
@@
static int request_frame(AVFilterLink *link)
AVFilterContext *ctx = link->src;
ThumbContext *s = ctx->priv;
- /* loop until a frame thumbnail is available (when a frame is queued,
- * s->n is reset to zero) */
- do {
+ /* TODO reindent */
int ret = ff_request_frame(ctx->inputs[0]);
if (ret == AVERROR_EOF && s->n) {
ret = ff_filter_frame(link, get_best_frame(ctx));
@@
-184,7
+182,6
@@
static int request_frame(AVFilterLink *link)
}
if (ret < 0)
return ret;
- } while (s->n);
return 0;
}