X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=encoder%2Flookahead.c;h=c6e07ddcd461d8e4ad7b934dfce38afe07f0e618;hb=d7ccd89f1bea53c8c524f8e6eb963d57defb6813;hp=ad8a3e68bf823b6003fd764bf73b82642988ab38;hpb=43ff8f1681c1cca997ca916508723abea85d0fa2;p=x264 diff --git a/encoder/lookahead.c b/encoder/lookahead.c index ad8a3e68..c6e07ddc 100644 --- a/encoder/lookahead.c +++ b/encoder/lookahead.c @@ -1,7 +1,7 @@ /***************************************************************************** * lookahead.c: high-level lookahead functions ***************************************************************************** - * Copyright (C) 2010-2013 Avail Media and x264 project + * Copyright (C) 2010-2015 Avail Media and x264 project * * Authors: Michael Kazmier * Alex Giladi @@ -89,16 +89,11 @@ static void x264_lookahead_slicetype_decide( x264_t *h ) static void *x264_lookahead_thread( x264_t *h ) { - int shift; -#if HAVE_MMX - if( h->param.cpu&X264_CPU_SSE_MISALIGN ) - x264_cpu_mask_misalign_sse(); -#endif while( !h->lookahead->b_exit_thread ) { x264_pthread_mutex_lock( &h->lookahead->ifbuf.mutex ); x264_pthread_mutex_lock( &h->lookahead->next.mutex ); - shift = X264_MIN( h->lookahead->next.i_max_size - h->lookahead->next.i_size, h->lookahead->ifbuf.i_size ); + int shift = X264_MIN( h->lookahead->next.i_max_size - h->lookahead->next.i_size, h->lookahead->ifbuf.i_size ); x264_lookahead_shift( &h->lookahead->next, &h->lookahead->ifbuf, shift ); x264_pthread_mutex_unlock( &h->lookahead->next.mutex ); if( h->lookahead->next.i_size <= h->lookahead->i_slicetype_length + h->param.b_vfr_input )