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

[lorenm]

Author: lorenm
Date: Mon Oct 19 23:23:08 2009
New Revision: 29787

Log:
sync to x264-r1296

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

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Oct 19 17:47:59 2009	(r29786)
+++ trunk/configure	Mon Oct 19 23:23:08 2009	(r29787)
@@ -7221,7 +7221,7 @@ if test "$_x264" = auto ; then
   cat > $TMPC << EOF
 #include <inttypes.h>
 #include <x264.h>
-#if X264_BUILD < 76
+#if X264_BUILD < 78
 #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	Mon Oct 19 17:47:59 2009	(r29786)
+++ trunk/libmpcodecs/ve_x264.c	Mon Oct 19 23:23:08 2009	(r29787)
@@ -185,7 +185,7 @@ static int config(struct vf_instance_s* 
         mod->mux->bih->biSize= sizeof(BITMAPINFOHEADER) + extradata_size;
     }
 
-    if (param.i_bframe > 1 && param.b_bframe_pyramid)
+    if (param.i_bframe > 1 && param.i_bframe_pyramid)
         mod->mux->decoder_delay = 2;
     else
         mod->mux->decoder_delay = param.i_bframe ? 1 : 0;