Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-14 03:16:39 +0300
committerMichael Niedermayer <michaelni@gmx.at>2014-12-14 04:12:49 +0300
commit28a6f970f64c4d5c1326dd68393bedf73cc42e10 (patch)
tree6e6bccab713c7f59fcb5ea4d8bfb6fa27a10d843 /ffmpeg.c
parentadd46edf33a72b5b3d3af3761d7b372d16769911 (diff)
ffmpeg: forward r_frame_rate to the muxer in case of stream copy
Fixes Ticket3629 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index eef774bda7..d38c90490c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2740,6 +2740,7 @@ static int transcode_init(void)
sar = dec_ctx->sample_aspect_ratio;
ost->st->sample_aspect_ratio = enc_ctx->sample_aspect_ratio = sar;
ost->st->avg_frame_rate = ist->st->avg_frame_rate;
+ ost->st->r_frame_rate = ist->st->r_frame_rate;
break;
case AVMEDIA_TYPE_SUBTITLE:
enc_ctx->width = dec_ctx->width;