diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 22:43:41 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-11 22:57:39 +0400 |
commit | 9eb99ab25b5ec9af9e575371c9ef84a37c63b3e5 (patch) | |
tree | df92b2b44496b4268d52c306974b92009b6f764e /ffmpeg.c | |
parent | de1824e970d448a84bedce4936c301c322baa714 (diff) | |
parent | ec2dbec84d94129207ed0f2a1151679fab305060 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: employ better names and add a convenient shorthand for vp6 tests
arm/neon: dsputil: use correct size specifiers on vld1/vst1
arm: dsputil: prettify some conditional instructions in put_pixels macros
vqavideo: change x/y loop counters to the usual pattern
avconv: use lrint() for rounding double timestamps
Conflicts:
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1980,11 +1980,11 @@ static void do_video_out(AVFormatContext *s, OutputStream *ost, if (delta <= -0.6) nb_frames = 0; else if (delta > 0.6) - ost->sync_opts = lrintf(sync_ipts); + ost->sync_opts = lrint(sync_ipts); break; case VSYNC_DROP: case VSYNC_PASSTHROUGH: - ost->sync_opts = lrintf(sync_ipts); + ost->sync_opts = lrint(sync_ipts); break; default: av_assert0(0); |