[MPlayer-cvslog] r31049 - in trunk: configure libmpcodecs/ve_x264.c

[lorenm]

Author: lorenm
Date: Tue Apr 20 11:14:54 2010
New Revision: 31049

Log:
Tell x264 that we aren't going to give it timestamps.
Fixes some warnings starting in x264-r1480.

Modified:
   trunk/configure
   trunk/libmpcodecs/ve_x264.c

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Apr 20 10:55:04 2010	(r31048)
+++ trunk/configure	Tue Apr 20 11:14:54 2010	(r31049)
@@ -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; }

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	Tue Apr 20 10:55:04 2010	(r31048)
+++ trunk/libmpcodecs/ve_x264.c	Tue Apr 20 11:14:54 2010	(r31049)
@@ -152,6 +152,7 @@ static int config(struct vf_instance *vf
     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;