Commit d9427e84 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 562f382c
......@@ -1462,11 +1462,12 @@ 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) {
SDL_CondWait(is->pictq_cond, is->pictq_mutex);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment