summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-28 02:28:50 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-28 02:28:50 +0100
commit738ebb4a0e0c8fbdc83b44cf30b8c9b7ac866270 (patch)
tree81f70da468f8cd5810577c599ad79803ab15b271 /ffmpeg.c
parent0075a22f415f7130a2fa9d81e55047a9bd18d0fa (diff)
ffmpeg: set VCFR when copying timestamps
This fixes unreasonable initial frame repeats Fixes Ticket3176 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 554cde6c87..62a548761c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -833,6 +833,9 @@ static void do_video_out(AVFormatContext *s,
&& input_files[ist->file_index]->input_ts_offset == 0) {
format_video_sync = VSYNC_VSCFR;
}
+ if (format_video_sync == VSYNC_CFR && copy_ts) {
+ format_video_sync = VSYNC_VSCFR;
+ }
}
switch (format_video_sync) {