# HG changeset patch
# User lorenm
# Date 1255987388 0
# Node ID 58e73accaeb7446532d4164c422ea22e81b5405b
# Parent  31765aadf02ca1d222edea19ce8d9f6d44786f53
sync to x264-r1296

diff -r 31765aadf02c -r 58e73accaeb7 configure
--- a/configure	Mon Oct 19 15:47:59 2009 +0000
+++ b/configure	Mon Oct 19 21:23:08 2009 +0000
@@ -7221,7 +7221,7 @@
   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; }
diff -r 31765aadf02c -r 58e73accaeb7 libmpcodecs/ve_x264.c
--- a/libmpcodecs/ve_x264.c	Mon Oct 19 15:47:59 2009 +0000
+++ b/libmpcodecs/ve_x264.c	Mon Oct 19 21:23:08 2009 +0000
@@ -185,7 +185,7 @@
         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;