[x264-devel] commit: Fix crash with threads and SSEMisalign on Phenom ( Jason Garrett-Glaser )

[Jason Garrett-Glaser]

On Mon, Nov 24, 2008 at 10:54 PM, Zuxy Meng <zuxy.meng at gmail.com> wrote:
> Hi,
>
> 2008/11/25 git version control <git at videolan.org>:
>> x264 | branch: master | Jason Garrett-Glaser <darkshikari at gmail.com> | Mon Nov 24 21:56:24 2008 -0800| [3a028c8e50238b7799175bd5a172e5517b4baf8d] | committer: Loren Merritt
>>
>> Fix crash with threads and SSEMisalign on Phenom
>> Misalign mask needed to be set separately for each encoding thread.
>>
>>> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=3a028c8e50238b7799175bd5a172e5517b4baf8d
>> ---
>>
>>  encoder/encoder.c |    6 ++++++
>>  1 files changed, 6 insertions(+), 0 deletions(-)
>>
>> diff --git a/encoder/encoder.c b/encoder/encoder.c
>> index fbb2ea1..1fd8611 100644
>> --- a/encoder/encoder.c
>> +++ b/encoder/encoder.c
>> @@ -1312,6 +1312,12 @@ static int x264_slices_write( x264_t *h )
>>  {
>>     int i_frame_size;
>>
>> +#ifdef HAVE_MMX
>> +    /* Misalign mask has to be set separately for each thread. */
>> +    if( h->param.cpu&X264_CPU_SSE_MISALIGN )
>> +        x264_cpu_mask_misalign_sse();
>> +#endif
>> +
>>  #if VISUALIZE
>>     if( h->param.b_visualize )
>>         x264_visualize_init( h );
>
> Why the commit appears two times with different diff? It leads to
> merge failure when I "git pull --rebase".

Git history modification.  I forgot to ifdef my change with HAVE_MMX,
so it broke non-x86 archs.  Loren fixed it.

git reset --hard origin/master is a nice way to completely reset your
local tree to deal with history modifications.

Dark Shikari