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/movenc.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/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index af03d1e4bb..5115585019 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4317,7 +4317,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) pkt->pts = AV_NOPTS_VALUE; } if (pkt->duration < 0) { - av_log(s, AV_LOG_ERROR, "Application provided duration: %d is invalid\n", pkt->duration); + av_log(s, AV_LOG_ERROR, "Application provided duration: %"PRId64" is invalid\n", pkt->duration); return AVERROR(EINVAL); } } |