diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-01 22:44:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-14 18:55:45 +0200 |
| commit | 16d8b13b3b26c19d7f8856e039fe6662d96b4ff3 (patch) | |
| tree | 5b4f54a7c7cb80209541f03e6d3225b0b7ab1ccb /fftools/ffmpeg.c | |
| parent | 8176799f31b23849382623f0f9001acc5edf7c76 (diff) | |
| download | ffmpeg-16d8b13b3b26c19d7f8856e039fe6662d96b4ff3.tar.gz | |
fftools/ffmpeg: Fallback to duration if sample rate is unavailable
Regression since: af1761f7
Fixes: Division by 0
Fixes: ffmpeg_crash_1
Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'fftools/ffmpeg.c')
| -rw-r--r-- | fftools/ffmpeg.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d4ac6903cc..ba8789a43c 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2710,8 +2710,12 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo ist->dts = ist->next_dts; switch (ist->dec_ctx->codec_type) { case AVMEDIA_TYPE_AUDIO: - ist->next_dts += ((int64_t)AV_TIME_BASE * ist->dec_ctx->frame_size) / - ist->dec_ctx->sample_rate; + if (ist->dec_ctx->sample_rate) { + ist->next_dts += ((int64_t)AV_TIME_BASE * ist->dec_ctx->frame_size) / + ist->dec_ctx->sample_rate; + } else { + ist->next_dts += av_rescale_q(pkt->duration, ist->st->time_base, AV_TIME_BASE_Q); + } break; case AVMEDIA_TYPE_VIDEO: if (ist->framerate.num) { |