Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use -vsync 0 unless the user explicitly asked for something

Browse Source 
else when the framerate is above 1000.
Fixes issue259.

Originally committed as revision 14208 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 17 years ago
parent b9fa32082c
commit 8858816d4c
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ffmpeg.c

4
ffmpeg.c
Unescape View File

@ -173,7 +173,7 @@ static char *pass_logfilename = NULL;
static int audio_stream_copy = 0; static int audio_stream_copy = 0;
static int video_stream_copy = 0; static int video_stream_copy = 0;
static int subtitle_stream_copy = 0; static int subtitle_stream_copy = 0;
static int video_sync_method= 1; static int video_sync_method= -1;
static int audio_sync_method= 0; static int audio_sync_method= 0;
static float audio_drift_threshold= 0.1; static float audio_drift_threshold= 0.1;
static int copy_ts= 0; static int copy_ts= 0;
@ -797,7 +797,7 @@ static void do_video_out(AVFormatContext *s,
*frame_size = 0; *frame_size = 0;
if(video_sync_method){ if(video_sync_method>0 || (video_sync_method && av_q2d(enc->time_base) > 0.001)){
double vdelta; double vdelta;
vdelta = get_sync_ipts(ost) / av_q2d(enc->time_base) - ost->sync_opts; vdelta = get_sync_ipts(ost) / av_q2d(enc->time_base) - ost->sync_opts;
//FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c //FIXME set to 0.5 after we fix some dts/pts bugs like in avidec.c

Write Preview
Loading…
Cancel
Save