X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=encoder%2Fanalyse.h;h=cea2fffc634682ea10de8d095c7336106d2399ab;hb=6e5033417a53fa66d002665618a1350d7417725e;hp=c5919c4cf4b9f2b3dce004f91cf11f751bd2526f;hpb=27a7b05b8330d0756e5e3f6669282561030f54fa;p=x264 diff --git a/encoder/analyse.h b/encoder/analyse.h index c5919c4c..cea2fffc 100644 --- a/encoder/analyse.h +++ b/encoder/analyse.h @@ -1,7 +1,7 @@ /***************************************************************************** * analyse.h: macroblock analysis ***************************************************************************** - * Copyright (C) 2003-2012 x264 project + * Copyright (C) 2003-2015 x264 project * * Authors: Laurent Aimar * Loren Merritt @@ -27,14 +27,13 @@ #ifndef X264_ANALYSE_H #define X264_ANALYSE_H -float *x264_analyse_prepare_costs( x264_t *h ); -int x264_analyse_init_costs( x264_t *h, float *logs, int qp ); +int x264_analyse_init_costs( x264_t *h ); void x264_analyse_free_costs( x264_t *h ); void x264_analyse_weight_frame( x264_t *h, int end ); void x264_macroblock_analyse( x264_t *h ); void x264_slicetype_decide( x264_t *h ); -void x264_slicetype_analyse( x264_t *h, int keyframe ); +void x264_slicetype_analyse( x264_t *h, int intra_minigop ); int x264_weighted_reference_duplicate( x264_t *h, int i_ref, const x264_weight_t *w );