summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-19 21:23:08 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-10-19 21:23:08 +0000
commite155d3d9f910508273b15990eb75e9de5fa67671 (patch)
tree3e5d912ec17f9257aeeae3c7260f034c50e1de77 /libmpcodecs
parentb2e3df350aeec14da52b1eec7d25c8c7595f617a (diff)
downloadmpv-e155d3d9f910508273b15990eb75e9de5fa67671.tar.bz2
mpv-e155d3d9f910508273b15990eb75e9de5fa67671.tar.xz
sync to x264-r1296
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ve_x264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index 36a42406a5..a3e51a08f1 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -185,7 +185,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
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;