aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-16 23:08:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-17 00:34:08 +0200
commitb87dd7f82d4df6c6207cab8e40e28e5b3fe81d0f (patch)
tree0d07f1b81f0423d6001ddb14c257b1699b034c6f /ffmpeg.c
parent8e3b1f259e5677fbc6d296666e9d7282a2ac3b86 (diff)
downloadffmpeg-b87dd7f82d4df6c6207cab8e40e28e5b3fe81d0f.tar.gz
ffmpeg: only apply last picture flush code at EOF
Fixes Ticket4562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index be8b0782ce..6fe169a1a8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1270,7 +1270,7 @@ static int reap_filters(int flush)
if (ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
av_log(NULL, AV_LOG_WARNING,
"Error in av_buffersink_get_frame_flags(): %s\n", av_err2str(ret));
- } else if (flush) {
+ } else if (flush && ret == AVERROR_EOF) {
if (filter->inputs[0]->type == AVMEDIA_TYPE_VIDEO)
do_video_out(of->ctx, ost, NULL, AV_NOPTS_VALUE);
}