Commit ef4d1fa4 authored by Loren Merritt's avatar Loren Merritt

cosmetics


git-svn-id: svn://svn.videolan.org/x264/trunk@120 df754926-b1dd-0310-bc7b-ec298dee348c
parent 6f298b9d
......@@ -1177,11 +1177,9 @@ void x264_macroblock_analyse( x264_t *h )
h->mb.qp[h->mb.i_mb_xy] = x264_ratecontrol_qp(h);
/* FIXME check if it's 12 */
if( h->mb.qp[h->mb.i_mb_xy] - h->mb.i_last_qp < -12 )
h->mb.qp[h->mb.i_mb_xy] = h->mb.i_last_qp - 12;
else if( h->mb.qp[h->mb.i_mb_xy] - h->mb.i_last_qp > 12 )
h->mb.qp[h->mb.i_mb_xy] = h->mb.i_last_qp + 12;
/* prevent QP from varying too fast. FIXME what's a sane limit? */
h->mb.qp[h->mb.i_mb_xy] = x264_clip3( h->mb.qp[h->mb.i_mb_xy],
h->mb.i_last_qp - 12, h->mb.i_last_qp + 12 );
/* init analysis */
x264_mb_analyse_init( h, &analysis, h->mb.qp[h->mb.i_mb_xy] );
......
......@@ -63,7 +63,7 @@ static int64_t i_mtime_filter = 0;
******************************* x264 libs **********************************
*
****************************************************************************/
static float x264_sqe( uint8_t *pix1, int i_pix_stride, uint8_t *pix2, int i_pix2_stride, int i_width, int i_height )
static int64_t x264_sqe( uint8_t *pix1, int i_pix_stride, uint8_t *pix2, int i_pix2_stride, int i_width, int i_height )
{
int64_t i_sqe = 0;
......
......@@ -33,7 +33,7 @@
* subpel_iters[i_subpel_refine] = { refine_hpel, refine_qpel, me_hpel, me_qpel }
* where me_* are the number of EPZS iterations run on all candidate block types,
* and refine_* are run only on the winner. */
const static int subpel_iterations[][4] =
static const int subpel_iterations[][4] =
{{1,0,0,0},
{1,1,0,0},
{1,2,0,0},
......
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