diff options
author | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 21:23:08 +0000 |
---|---|---|
committer | lorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-10-19 21:23:08 +0000 |
commit | e155d3d9f910508273b15990eb75e9de5fa67671 (patch) | |
tree | 3e5d912ec17f9257aeeae3c7260f034c50e1de77 | |
parent | b2e3df350aeec14da52b1eec7d25c8c7595f617a (diff) | |
download | mpv-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
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | libmpcodecs/ve_x264.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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; } 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; |