diff -Nru mplayer-export-2009-07-12.orig/libavcodec/libx264.c mplayer-export-2009-07-12/libavcodec/libx264.c
--- mplayer-export-2009-07-12.orig/libavcodec/libx264.c	2009-07-01 01:45:01.000000000 +0200
+++ mplayer-export-2009-07-12/libavcodec/libx264.c	2009-12-07 22:46:18.000000000 +0100
@@ -187,7 +187,7 @@
     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
     x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
     x4->params.i_bframe_bias = avctx->bframebias;
-    x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
+    x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE;
     avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
 
     x4->params.i_keyint_min = avctx->keyint_min;
diff -Nru mplayer-export-2009-07-12.orig/libmpcodecs/ve_x264.c mplayer-export-2009-07-12/libmpcodecs/ve_x264.c
--- mplayer-export-2009-07-12.orig/libmpcodecs/ve_x264.c	2009-05-13 04:58:57.000000000 +0200
+++ mplayer-export-2009-07-12/libmpcodecs/ve_x264.c	2009-12-07 23:01:05.000000000 +0100
@@ -207,7 +207,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;