diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:14:59 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 15:22:52 +0200 |
| commit | b01891a9f08b9d271d75d179b3138242a958ee04 (patch) | |
| tree | 6180f466be7e17e8059b3ab69a1fb5d95e776e32 /libavformat/mux.c | |
| parent | d3e5fbb1406995e07fccbff3ca8c1e24f57a1f7b (diff) | |
| parent | 948f3c19a8bd069768ca411212aaf8c1ed96b10d (diff) | |
Merge commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d'
* commit '948f3c19a8bd069768ca411212aaf8c1ed96b10d':
lavc: Make AVPacket.duration int64, and deprecate convergence_duration
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index 37b5976464..c9ef490bd2 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -496,7 +496,7 @@ static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt) av_ts2str(pkt->pts), av_ts2str(pkt->dts), av_ts2str(st->cur_dts), delay, pkt->size, pkt->stream_index); if (pkt->duration < 0 && st->codec->codec_type != AVMEDIA_TYPE_SUBTITLE) { - av_log(s, AV_LOG_WARNING, "Packet with invalid duration %d in stream %d\n", + av_log(s, AV_LOG_WARNING, "Packet with invalid duration %"PRId64" in stream %d\n", pkt->duration, pkt->stream_index); pkt->duration = 0; } |