diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-22 02:37:08 -0500 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-22 02:37:08 -0500 |
| commit | bc1e061c245cfb1d8a8fdd52cfa394bf117f770a (patch) | |
| tree | 05f33f51bab749a67c82c67ae34a4f83edeb903a /libavformat/dump.c | |
| parent | a4a2a44d6836e2f58d9112bdb384e4f2cfac905d (diff) | |
| parent | 79f407b79a825c3123aff65cef64b383eca5a95e (diff) | |
| download | android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.gz android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.tar.bz2 android_external_ffmpeg-bc1e061c245cfb1d8a8fdd52cfa394bf117f770a.zip | |
Merge branch 'release/2.8' of https://github.com/FFmpeg/FFmpeg into cm-13.0
Diffstat (limited to 'libavformat/dump.c')
| -rw-r--r-- | libavformat/dump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 705da82148..08b86935e4 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -496,7 +496,7 @@ void av_dump_format(AVFormatContext *ic, int index, av_log(NULL, AV_LOG_INFO, " Duration: "); if (ic->duration != AV_NOPTS_VALUE) { int hours, mins, secs, us; - int64_t duration = ic->duration + 5000; + int64_t duration = ic->duration + (ic->duration <= INT64_MAX - 5000 ? 5000 : 0); secs = duration / AV_TIME_BASE; us = duration % AV_TIME_BASE; mins = secs / 60; |