Commit ef48e51d authored by Fiona Glaser's avatar Fiona Glaser

Minor fixes and cosmetics

Suppress a GCC warning, fix a non-problematic array overflow, one REP->REP_RET.
parent 65304078
......@@ -920,7 +920,7 @@ cglobal x264_coeff_level_run%2_%1,0,7
inc t6d
sub t4d, t3d
jge .loop
RET
REP_RET
%endmacro
INIT_MMX
......
......@@ -541,6 +541,8 @@ static int ALWAYS_INLINE x264_cabac_mb_cbf_ctxidxinc( x264_t *h, int i_cat, int
i_nza = h->mb.i_neighbour & MB_LEFT ? (h->mb.cbp[h->mb.i_mb_xy - 1] >> (9 + i_idx)) & 1 : b_intra;
i_nzb = h->mb.i_neighbour & MB_TOP ? (h->mb.cbp[h->mb.i_mb_top_xy] >> (9 + i_idx)) & 1 : b_intra;
return 4*i_cat + 2*i_nzb + i_nza;
default:
return 0;
}
}
......
......@@ -1734,7 +1734,8 @@ static void x264_encoder_frame_end( x264_t *h, x264_t *thread_current,
pic_out->i_pts = h->fenc->i_pts;
pic_out->img.i_plane = h->fdec->i_plane;
for(i = 0; i < 4; i++){
for(i = 0; i < 3; i++)
{
pic_out->img.i_stride[i] = h->fdec->i_stride[i];
pic_out->img.plane[i] = h->fdec->plane[i];
}
......
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