diff options
| author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-20 09:14:54 +0000 |
|---|---|---|
| committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-20 09:14:54 +0000 |
| commit | c462186142cdf5b0a9ccbde71d5d5b0eafa4fcae (patch) | |
| tree | cb1ea3ae31b52a30beb2d92332cd41622c54f304 | |
| parent | 9ec5f2f565cf1182365d7c781e8b03dbe12617e3 (diff) | |
| download | mpv-c462186142cdf5b0a9ccbde71d5d5b0eafa4fcae.tar.bz2 mpv-c462186142cdf5b0a9ccbde71d5d5b0eafa4fcae.tar.xz | |
Tell x264 that we aren't going to give it timestamps.
Fixes some warnings starting in x264-r1480.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31049 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libmpcodecs/ve_x264.c | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -7484,7 +7484,7 @@ if test "$_x264" = auto ; then cat > $TMPC << EOF #include <inttypes.h> #include <x264.h> -#if X264_BUILD < 83 +#if X264_BUILD < 89 #error We do not support old versions of x264. Get the latest from git. #endif int main(void) { x264_encoder_open((void*)0); return 0; } diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 1c59e84397..c14b71ab55 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -152,6 +152,7 @@ static int config(struct vf_instance *vf, int width, int height, int d_width, in param.i_height = height; param.i_fps_num = mod->mux->h.dwRate; param.i_fps_den = mod->mux->h.dwScale; + param.b_vfr_input = 0; param.vui.i_sar_width = d_width*height; param.vui.i_sar_height = d_height*width; |