[FFmpeg-cvslog] commit: Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame(). (Stefano Sabatini )

git at videolan.org git
Mon Jan 17 22:36:37 CET 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sun Jan 16 18:17:00 2011 +0100| [d72858f89f7062b04968cf28f3661ebe1ba398f8] | committer: Stefano Sabatini 

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d72858f89f7062b04968cf28f3661ebe1ba398f8
---

 ffplay.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

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);




More information about the ffmpeg-cvslog mailing list