git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f2386b
)
ffmpeg: dont detect slight (0.1sec) backward moving dts as discontinuity
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 6 Oct 2013 20:34:50 +0000
(22:34 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 6 Oct 2013 23:36:05 +0000
(
01:36
+0200)
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
d1c841f
..
38a3bd0
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-3043,7
+3043,7
@@
static int process_input(int file_index)
if(delta < -1LL*dts_delta_threshold*AV_TIME_BASE ||
(delta > 1LL*dts_delta_threshold*AV_TIME_BASE &&
ist->st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) ||
- pkt_dts
+1<
ist->pts){
+ pkt_dts
+ AV_TIME_BASE/10 <
ist->pts){
ifile->ts_offset -= delta;
av_log(NULL, AV_LOG_DEBUG,
"timestamp discontinuity %"PRId64", new offset= %"PRId64"\n",