[SCM] libav/experimental: Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame().

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d72858f89f7062b04968cf28f3661ebe1ba398f8
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Sun Jan 16 18:17:00 2011 +0100

    Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame().

diff --git a/ffplay.c b/ffplay.c
index b2a1d45..2a2e823 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1588,9 +1588,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame, int64_t *pts, AVPacke
         if (*pts == AV_NOPTS_VALUE) {
             *pts = 0;
         }
-    }
 
-    if (got_picture){
         is->skip_frames_index += 1;
         if(is->skip_frames_index >= is->skip_frames){
             is->skip_frames_index -= FFMAX(is->skip_frames, 1.0);

-- 
Libav/FFmpeg packaging