Commit fad82ca2 authored by michael's avatar michael

Only reschedule refresh if we successfully removed the scheduled one.

Fixes some spurious error messages.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@22435 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 47f6a039
...@@ -1462,11 +1462,12 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke ...@@ -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) //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++){ for(i=0; i<VIDEO_PICTURE_QUEUE_SIZE; i++){
if(is->pictq[i].timer_id){ 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; is->pictq[i].timer_id=0;
schedule_refresh(is, 1); schedule_refresh(is, 1);
} }
} }
}
while (is->pictq_size && !is->videoq.abort_request) { while (is->pictq_size && !is->videoq.abort_request) {
SDL_CondWait(is->pictq_cond, is->pictq_mutex); 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