[FFmpeg-cvslog] ffmpeg: set VCFR when copying timestamps

[Michael Niedermayer]

ffmpeg | branch: release/2.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 28 02:28:50 2013 +0100| [88e368d5a7ab9a97dc7fb7a5b11b47e864c2621b] | committer: Carl Eugen Hoyos

ffmpeg: set VCFR when copying timestamps

This fixes unreasonable initial frame repeats
Fixes Ticket3176

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 738ebb4a0e0c8fbdc83b44cf30b8c9b7ac866270)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=88e368d5a7ab9a97dc7fb7a5b11b47e864c2621b
---

 ffmpeg.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 6629a5f..dba6089 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -825,6 +825,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) {