summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-10-01 11:47:23 +0200
committerTobias Rapp <t.rapp@noa-archive.com>2017-03-17 11:54:38 +0100
commit8db301deadfcf113fb274881e65afcbe3e1bd645 (patch)
treed285b18b1e03a7a478f13025e09aec6a4342c089 /ffmpeg.c
parent2db5ab73d43a8c22616e686ab12f94223910c761 (diff)
ffmpeg: set the encoding framerate when the output is CFR
(cherry picked from Libav commit d10102d23c9467d4eb84f58e0cd12be284b982f6) Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 63fc1bc5f4..dbfb14bfca 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3314,6 +3314,8 @@ static int init_output_stream_encode(OutputStream *ost)
enc_ctx->bits_per_raw_sample = FFMIN(dec_ctx->bits_per_raw_sample,
av_pix_fmt_desc_get(enc_ctx->pix_fmt)->comp[0].depth);
+ enc_ctx->framerate = ost->frame_rate;
+
ost->st->avg_frame_rate = ost->frame_rate;
if (!dec_ctx ||