aboutsummaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-16 18:17:00 +0100
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-17 22:31:11 +0100
commitd72858f89f7062b04968cf28f3661ebe1ba398f8 (patch)
treec7ecedfe54083ce626b491356439be819843ffb2 /ffplay.c
parentdb323491cd4ad839518b9874a3aad12f4d311ea4 (diff)
downloadandroid_external_ffmpeg-d72858f89f7062b04968cf28f3661ebe1ba398f8.tar.gz
android_external_ffmpeg-d72858f89f7062b04968cf28f3661ebe1ba398f8.tar.bz2
android_external_ffmpeg-d72858f89f7062b04968cf28f3661ebe1ba398f8.zip
Merge two if (got_picture) {} blocks in ffplay.c:get_video_frame().
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/ffplay.c b/ffplay.c
index b2a1d456c9..2a2e8239e3 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);