diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-11-01 00:48:56 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-11-01 19:55:56 +0000 |
| commit | cf170869821aff42f59538c62574f9f7bdce85d6 (patch) | |
| tree | 02b8c2498a64a48deda8b86605308e6b23de4947 /fftools/ffmpeg.c | |
| parent | 4600b0619afc58b58de1a21d7a2c472e0d788282 (diff) | |
ffmpeg: Fix flush packet stream copy input timestamp handling
Since a7da13474286774cf378c3ea606c19a7c1a0eba3, flush packets are passed
to process_input_packet() during stream copy. This modifies the input
timestamp handling to ignore them - since they contain no data, timestamps
should not be affected.
Diffstat (limited to 'fftools/ffmpeg.c')
| -rw-r--r-- | fftools/ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 942579b378..286d898b12 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2699,7 +2699,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo } /* handle stream copy */ - if (!ist->decoding_needed) { + if (!ist->decoding_needed && pkt) { ist->dts = ist->next_dts; switch (ist->dec_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: @@ -2712,7 +2712,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo AVRational time_base_q = AV_TIME_BASE_Q; int64_t next_dts = av_rescale_q(ist->next_dts, time_base_q, av_inv_q(ist->framerate)); ist->next_dts = av_rescale_q(next_dts + 1, av_inv_q(ist->framerate), time_base_q); - } else if (pkt && pkt->duration) { + } else if (pkt->duration) { ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); } else if(ist->dec_ctx->framerate.num != 0) { int ticks= av_stream_get_parser(ist->st) ? av_stream_get_parser(ist->st)->repeat_pict + 1 : ist->dec_ctx->ticks_per_frame; |