From f07cb53ab95172f7c15e14b004c4ebcb04aad44c Mon Sep 17 00:00:00 2001
From: Marton Balint <cus@passwd.hu>
Date: Sun, 7 Jul 2013 02:54:22 +0200
Subject: [PATCH] ffplay: assume 0 stream start time if start time is unset in
duration check
Fixes ticket #2103 and #2743.
Signed-off-by: Marton Balint <cus@passwd.hu>
---
ffplay.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ffplay.c b/ffplay.c
index b8783da0a26..dfe99e9c738 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2685,6 +2685,7 @@ static int read_thread(void *arg)
int st_index[AVMEDIA_TYPE_NB];
AVPacket pkt1, *pkt = &pkt1;
int eof = 0;
+ int64_t stream_start_time;
int pkt_in_play_range = 0;
AVDictionaryEntry *t;
AVDictionary **opts;
@@ -2926,8 +2927,9 @@ static int read_thread(void *arg)
continue;
}
/* check if packet is in play range specified by user, then queue, otherwise discard */
+ stream_start_time = ic->streams[pkt->stream_index]->start_time;
pkt_in_play_range = duration == AV_NOPTS_VALUE ||
- (pkt->pts - ic->streams[pkt->stream_index]->start_time) *
+ (pkt->pts - (stream_start_time != AV_NOPTS_VALUE ? stream_start_time : 0)) *
av_q2d(ic->streams[pkt->stream_index]->time_base) -
(double)(start_time != AV_NOPTS_VALUE ? start_time : 0) / 1000000
<= ((double)duration / 1000000);
--
GitLab