summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-03-10 16:11:02 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-03-10 16:11:02 +0000
commitd9427e848e5938f926eb785937629dd99a59aa11 (patch)
tree628a5dbe6fc0f3e01d17b838479c0f56f6714643 /ffplay.c
parent562f382cab4f6fe098e203c7adced59cc6299017 (diff)
Only reschedule refresh if we successfully removed the scheduled one.
Fixes some spurious error messages. Originally committed as revision 22435 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 89650e496a..b42a2a20e5 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1462,9 +1462,10 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
//Make sure there are no long delay timers (ideally we should just flush the que but thats harder)
for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++){
if(is->pictq[i].timer_id){
- SDL_RemoveTimer(is->pictq[i].timer_id);
+ if(SDL_RemoveTimer(is->pictq[i].timer_id)){
is->pictq[i].timer_id=0;
schedule_refresh(is, 1);
+ }
}
}
while (is->pictq_size && !is->videoq.abort_request) {