revert 216, another try at max_dec_frame_buffering.

disable adaptive cabac_idc by default; 0 is always best anyway.

git-svn-id: svn://svn.videolan.org/x264/trunk@255 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/common/common.c b/common/common.c
index 58cf2feb16cbcc6048eeb74848bd9cade13d7ea3..3554d193d9854b35fb7566116931ecdf85f2e8cf 100644 (file)
--- a/common/common.c
+++ b/common/common.c
@@ -73,7 +73,7 @@ void    x264_param_default( x264_param_t *param )
     param->i_deblocking_filter_beta = 0;
 
     param->b_cabac = 1;
-    param->i_cabac_init_idc = -1;
+    param->i_cabac_init_idc = 0;
 
     param->rc.b_cbr = 0;
     param->rc.i_bitrate = 1000;

diff --git a/encoder/set.c b/encoder/set.c
index cf0dd46129496899026f32e3e9067c322d1abdbf..cc61b8b5ceffea5dea358cb1a781ade0380b6636 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -83,8 +83,8 @@ void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param )
     }
 
     sps->vui.i_num_reorder_frames = param->b_bframe_pyramid ? 2 : param->i_bframe ? 1 : 0;
+    sps->vui.i_max_dec_frame_buffering =
     sps->i_num_ref_frames = X264_MIN(16, param->i_frame_reference + sps->vui.i_num_reorder_frames);
-    sps->vui.i_max_dec_frame_buffering = sps->i_num_ref_frames + 1;
 
     sps->b_gaps_in_frame_num_value_allowed = 0;
     sps->i_mb_width = ( param->i_width + 15 ) / 16;