summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-10-01 11:47:23 +0200
committerAnton Khirnov <anton@khirnov.net>2016-10-02 11:41:45 +0200
commitd10102d23c9467d4eb84f58e0cd12be284b982f6 (patch)
tree3dcfec38b23a2ca1b25129309b07082b5d1cf0f6 /avconv.c
parent5bf2454e7cb03609b3ec1a3cf4c22427fe5f8e36 (diff)
downloadffmpeg-d10102d23c9467d4eb84f58e0cd12be284b982f6.tar.gz
avconv: set the encoding framerate when the output is CFR
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/avconv.c b/avconv.c
index 59eb3009b1..87923b9825 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1978,6 +1978,8 @@ static int init_output_stream_encode(OutputStream *ost)
ost->filter->filter->inputs[0]->sample_aspect_ratio;
enc_ctx->pix_fmt = ost->filter->filter->inputs[0]->format;
+ enc_ctx->framerate = ost->frame_rate;
+
ost->st->avg_frame_rate = ost->frame_rate;
if (dec_ctx &&