summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSasi Inguva <isasi-at-google.com@ffmpeg.org>2017-10-10 10:36:58 -0700
committerMichael Niedermayer <michael@niedermayer.cc>2017-10-12 01:27:52 +0200
commit2b006ccf8318d84101ed83b75df4c9682a963217 (patch)
tree01b18aecc2b575003df5e93a9387a3343b1cef12
parent37caed777472256f0bb817adf1c5b8d9f59d85ae (diff)
downloadffmpeg-streaming-2b006ccf8318d84101ed83b75df4c9682a963217.zip
ffmpeg-streaming-2b006ccf8318d84101ed83b75df4c9682a963217.tar.gz
ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.
This is required for FLV files, for which duration_pts comes out to be zero. Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Thomas Mundt <tmundt75@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--fftools/ffmpeg.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 6d64bc1..3ee3147 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -2665,8 +2665,13 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
ist->next_dts = AV_NOPTS_VALUE;
}
- if (got_output)
- ist->next_pts += av_rescale_q(duration_pts, ist->st->time_base, AV_TIME_BASE_Q);
+ if (got_output) {
+ if (duration_pts > 0) {
+ ist->next_pts += av_rescale_q(duration_pts, ist->st->time_base, AV_TIME_BASE_Q);
+ } else {
+ ist->next_pts += duration_dts;
+ }
+ }
break;
case AVMEDIA_TYPE_SUBTITLE:
if (repeating)
OpenPOWER on IntegriCloud