Commit adc25db9 authored by Fiona Glaser's avatar Fiona Glaser

Fix keyint=1 + VBV + rc-lookahead

parent 2d3958bf
......@@ -478,6 +478,8 @@ static int x264_validate_parameters( x264_t *h )
h->param.analyse.i_direct_mv_pred = X264_DIRECT_PRED_SPATIAL;
}
h->param.i_bframe = x264_clip3( h->param.i_bframe, 0, X264_BFRAME_MAX );
if( h->param.i_keyint_max == 1 )
h->param.i_bframe = 0;
h->param.i_bframe_bias = x264_clip3( h->param.i_bframe_bias, -90, 100 );
h->param.b_bframe_pyramid = h->param.b_bframe_pyramid && h->param.i_bframe > 1;
if( !h->param.i_bframe )
......
......@@ -861,7 +861,7 @@ static void x264_slicetype_analyse( x264_t *h, int keyframe )
{
if( ((j-keyint_limit) % h->param.i_keyint_max) == 0 )
{
if( j )
if( j && h->param.i_keyint_max > 1 )
frames[j]->i_type = X264_TYPE_P;
frames[j+1]->i_type = X264_TYPE_IDR;
reset_start = X264_MIN( reset_start, j+2 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment