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:
dc23e35
)
lavf/mux: don't warn about missing timestamps on attached pictures
author
Rodger Combs
<rodger.combs@gmail.com>
Sun, 13 Nov 2016 00:01:52 +0000
(18:01 -0600)
committer
Rodger Combs
<rodger.combs@gmail.com>
Mon, 14 Nov 2016 07:45:02 +0000
(
01:45
-0600)
libavformat/mux.c
patch
|
blob
|
history
diff --git
a/libavformat/mux.c
b/libavformat/mux.c
index
4d47ddc
..
e500531
100644
(file)
--- a/
libavformat/mux.c
+++ b/
libavformat/mux.c
@@
-575,6
+575,7
@@
static int compute_muxer_pkt_fields(AVFormatContext *s, AVStream *st, AVPacket *
if (!s->internal->missing_ts_warning &&
!(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
+ (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC) || (st->disposition & AV_DISPOSITION_TIMED_THUMBNAILS)) &&
(pkt->pts == AV_NOPTS_VALUE || pkt->dts == AV_NOPTS_VALUE)) {
av_log(s, AV_LOG_WARNING,
"Timestamps are unset in a packet for stream %d. "