diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-04-04 13:06:22 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-10-15 06:38:16 +0000 |
| commit | 557d4c4ecae080729e68df54ed2bd8420d0f037a (patch) | |
| tree | c7dcaec5b839862ca8340b301f413871f4ce3f9b | |
| parent | 2d6e58497e76836604364b037df9b00ba3d75b69 (diff) | |
| download | ffmpeg-557d4c4ecae080729e68df54ed2bd8420d0f037a.tar.gz | |
avconv: replace AVCodecContext.time_base with framerate
| -rw-r--r-- | avconv.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1401,10 +1401,10 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt) else if (ist->st->avg_frame_rate.num) ist->next_dts += av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate), AV_TIME_BASE_Q); - else if (ist->dec_ctx->time_base.num != 0) { + else if (ist->dec_ctx->framerate.num != 0) { int ticks = ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->dec_ctx->ticks_per_frame; - ist->next_dts += av_rescale_q(ticks, ist->dec_ctx->time_base, AV_TIME_BASE_Q); + ist->next_dts += av_rescale_q(ticks, ist->dec_ctx->framerate, AV_TIME_BASE_Q); } break; case AVMEDIA_TYPE_SUBTITLE: @@ -1435,11 +1435,11 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt) ist->dec_ctx->sample_rate; break; case AVMEDIA_TYPE_VIDEO: - if (ist->dec_ctx->time_base.num != 0) { + if (ist->dec_ctx->framerate.num != 0) { int ticks = ist->st->parser ? ist->st->parser->repeat_pict + 1 : ist->dec_ctx->ticks_per_frame; ist->next_dts += ((int64_t)AV_TIME_BASE * - ist->dec_ctx->time_base.num * ticks) / - ist->dec_ctx->time_base.den; + ist->dec_ctx->framerate.den * ticks) / + ist->dec_ctx->framerate.num; } break; } |