Commit 22cc1a97 authored by Sam Hocevar's avatar Sam Hocevar

* ./src/input/input_ext-plugins.c: reverted my previous fix which wasn't

    really a fix.
  * ./plugins/memcpy/fastmemcpy.h: commented out suspicious code.
parent 5769061d
/***************************************************************************** /*****************************************************************************
* fastmemcpy.h : fast memcpy routines * fastmemcpy.h : fast memcpy routines
***************************************************************************** *****************************************************************************
* $Id: fastmemcpy.h,v 1.3 2002/04/03 22:36:50 massiot Exp $ * $Id: fastmemcpy.h,v 1.3.2.1 2002/07/21 23:41:44 sam Exp $
* *
* Authors: various Linux kernel hackers * Authors: various Linux kernel hackers
* various MPlayer hackers * various MPlayer hackers
...@@ -275,6 +275,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len) ...@@ -275,6 +275,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len)
// printf(" %d %d\n", (int)from&1023, (int)to&1023); // printf(" %d %d\n", (int)from&1023, (int)to&1023);
// Pure Assembly cuz gcc is a bit unpredictable ;) // Pure Assembly cuz gcc is a bit unpredictable ;)
#if 0
if(i>=BLOCK_SIZE/64) if(i>=BLOCK_SIZE/64)
asm volatile( asm volatile(
"xorl %%eax, %%eax \n\t" "xorl %%eax, %%eax \n\t"
...@@ -334,6 +335,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len) ...@@ -334,6 +335,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len)
: "r" (BLOCK_SIZE), "i" (BLOCK_SIZE/64), "i" (CONFUSION_FACTOR) : "r" (BLOCK_SIZE), "i" (BLOCK_SIZE/64), "i" (CONFUSION_FACTOR)
: "%eax", "%ebx" : "%eax", "%ebx"
); );
#endif
for(; i>0; i--) for(; i>0; i--)
{ {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* input_ext-plugins.c: useful functions for access and demux plug-ins * input_ext-plugins.c: useful functions for access and demux plug-ins
***************************************************************************** *****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN * Copyright (C) 2001, 2002 VideoLAN
* $Id: input_ext-plugins.c,v 1.10.2.1 2002/07/21 14:37:35 sam Exp $ * $Id: input_ext-plugins.c,v 1.10.2.2 2002/07/21 23:41:44 sam Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* *
...@@ -554,11 +554,9 @@ ssize_t input_FillBuffer( input_thread_t * p_input ) ...@@ -554,11 +554,9 @@ ssize_t input_FillBuffer( input_thread_t * p_input )
p_input->i_bufsize ); p_input->i_bufsize );
if( i_ret < 0 ) i_ret = 0; if( i_ret < 0 ) i_ret = 0;
vlc_mutex_lock( &p_input->p_method_data->lock );
p_input->p_data_buffer = p_buf; p_input->p_data_buffer = p_buf;
p_input->p_current_data = (byte_t *)p_buf + sizeof(data_buffer_t); p_input->p_current_data = (byte_t *)p_buf + sizeof(data_buffer_t);
p_input->p_last_data = p_input->p_current_data + i_remains + i_ret; p_input->p_last_data = p_input->p_current_data + i_remains + i_ret;
vlc_mutex_unlock( &p_input->p_method_data->lock );
return( (ssize_t)i_remains + i_ret ); return( (ssize_t)i_remains + i_ret );
} }
......
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