summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2013-08-04 21:07:16 +0200
committerMarton Balint <cus@passwd.hu>2013-08-09 00:16:13 +0200
commit18be3fac1d04e02bace8fe6e6375b6d14f411514 (patch)
treee292df71da50ed69e0535129afb05efa3382fe2f
parente84ca8d38a18deac55dbc2c9337a7588337039cc (diff)
downloadffmpeg-18be3fac1d04e02bace8fe6e6375b6d14f411514.tar.gz
ffplay: check for filter EOF return codes
Fixes ticket #2800. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--ffplay.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index 4b9c6363d3..26a145277e 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1956,6 +1956,8 @@ static int video_thread(void *arg)
ret = av_buffersink_get_frame_flags(filt_out, frame, 0);
if (ret < 0) {
+ if (ret == AVERROR_EOF)
+ is->video_finished = serial;
ret = 0;
break;
}
@@ -2236,6 +2238,8 @@ static int audio_decode_frame(VideoState *is)
is->audio_buf_frames_pending = 0;
continue;
}
+ if (ret == AVERROR_EOF)
+ is->audio_finished = is->audio_pkt_temp_serial;
return ret;
}
is->audio_buf_frames_pending = 1;