OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6498549
)
avformat/movenc: Skip duration check for discontinuous fragments
author
Michael Niedermayer
<michael@niedermayer.cc>
Tue, 18 Oct 2016 16:18:49 +0000
(18:18 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 19 Oct 2016 11:25:21 +0000
(13:25 +0200)
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/movenc.c
patch
|
blob
|
history
diff --git
a/libavformat/movenc.c
b/libavformat/movenc.c
index
d7c7158
..
50be8ff
100644
(file)
--- a/
libavformat/movenc.c
+++ b/
libavformat/movenc.c
@@
-4697,7
+4697,8
@@
static int check_pkt(AVFormatContext *s, AVPacket *pkt)
if (trk->entry) {
ref = trk->cluster[trk->entry - 1].dts;
- } else if (trk->start_dts != AV_NOPTS_VALUE) {
+ } else if ( trk->start_dts != AV_NOPTS_VALUE
+ && !trk->frag_discont) {
ref = trk->start_dts + trk->track_duration;
} else
ref = pkt->dts; // Skip tests for the first packet