aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2009-11-25 23:33:47 +0000
committerMichael Niedermayer <michaelni@gmx.at>2009-11-25 23:33:47 +0000
commit9ff261a2b2a4b6485f219f5ed4a63ff2738e85ee (patch)
treeef187460b91443400b6d4dcddf8261d8766d3ee3 /ffmpeg.c
parent7cab9a6674fb0f4b3bd309854bcbe7e9bce3dc1e (diff)
downloadffmpeg-9ff261a2b2a4b6485f219f5ed4a63ff2738e85ee.tar.gz
Remove special case that changed video sync behavior for av_q2d(enc->time_base) <= 0.001.
This should make the default behave more like one would expect and not change behavior at 1000fps. Originally committed as revision 20615 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5d6d994d42..2cb9132c10 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -883,7 +883,7 @@ static void do_video_out(AVFormatContext *s,
*frame_size = 0;
- if(video_sync_method>0 || (video_sync_method && av_q2d(enc->time_base) > 0.001)){
+ if(video_sync_method){
double vdelta;
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