summaryrefslogtreecommitdiff
path: root/ffplay.c
diff options
context:
space:
mode:
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/ffplay.c b/ffplay.c
index 779c87967a..708dab8d63 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -99,7 +99,6 @@ typedef struct PacketQueue {
typedef struct VideoPicture {
double pts; ///< presentation time stamp for this picture
- double duration; ///< expected duration of the frame
int64_t pos; ///< byte position in file
int skip;
SDL_Overlay *bmp;
@@ -1194,13 +1193,8 @@ retry:
if (is->pictq_size > 1) {
VideoPicture *nextvp = &is->pictq[(is->pictq_rindex + 1) % VIDEO_PICTURE_QUEUE_SIZE];
- duration = nextvp->pts - vp->pts; // More accurate this way, 1/time_base is often not reflecting FPS
- } else {
- duration = vp->duration;
- }
-
- if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
- if(is->pictq_size > 1){
+ duration = nextvp->pts - vp->pts;
+ if((framedrop>0 || (framedrop && is->audio_st)) && time > is->frame_timer + duration){
is->frame_drops_late++;
pictq_next_picture(is);
goto retry;
@@ -1387,8 +1381,6 @@ static int queue_picture(VideoState *is, AVFrame *src_frame, double pts1, int64_
vp = &is->pictq[is->pictq_windex];
- vp->duration = frame_delay;
-
/* alloc or resize hardware picture buffer */
if (!vp->bmp || vp->reallocate ||
vp->width != src_frame->width ||