[SCM] libav/experimental: Only reschedule refresh if we successfully removed the scheduled one. Fixes some spurious error messages.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d9427e848e5938f926eb785937629dd99a59aa11
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Mar 10 16:11:02 2010 +0000

    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

diff --git a/ffplay.c b/ffplay.c
index 89650e4..b42a2a2 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) {

-- 
Libav/FFmpeg packaging