Commit 3a8481df authored by Christophe Massiot's avatar Christophe Massiot

* Reverted something that wasn't supposed to go into the cvs :p

* Removed -fargument-noalias-global which causes problems with as (???).
parent 91bf1a91
...@@ -2975,8 +2975,8 @@ fi ...@@ -2975,8 +2975,8 @@ fi
rm -f conftest* rm -f conftest*
CFLAGS="${CFLAGS} -fargument-noalias-global -fstrict-aliasing" CFLAGS="${CFLAGS} -fargument-noalias-global -fstrict-aliasing"
echo $ac_n "checking if \$CC accepts -fargument-noalias-global -fstrict-aliasing""... $ac_c" 1>&6 echo $ac_n "checking if \$CC accepts -fstrict-aliasing""... $ac_c" 1>&6
echo "configure:2980: checking if \$CC accepts -fargument-noalias-global -fstrict-aliasing" >&5 echo "configure:2980: checking if \$CC accepts -fstrict-aliasing" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2982 "configure" #line 2982 "configure"
#include "confdefs.h" #include "confdefs.h"
...@@ -2987,7 +2987,7 @@ int main() { ...@@ -2987,7 +2987,7 @@ int main() {
EOF EOF
if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
BIZARRE_OPTIMS="-fargument-noalias-global -fstrict-aliasing" BIZARRE_OPTIMS="-fstrict-aliasing"
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
else else
echo "configure: failed program was:" >&5 echo "configure: failed program was:" >&5
......
...@@ -80,9 +80,9 @@ void foo() { int meuh; ntohl(meuh); }],, ...@@ -80,9 +80,9 @@ void foo() { int meuh; ntohl(meuh); }],,
dnl Check for special optimization flags dnl Check for special optimization flags
CFLAGS="${CFLAGS} -fargument-noalias-global -fstrict-aliasing" CFLAGS="${CFLAGS} -fargument-noalias-global -fstrict-aliasing"
AC_MSG_CHECKING([if \$CC accepts -fargument-noalias-global -fstrict-aliasing]) AC_MSG_CHECKING([if \$CC accepts -fstrict-aliasing])
AC_TRY_COMPILE([],, AC_TRY_COMPILE([],,
BIZARRE_OPTIMS="-fargument-noalias-global -fstrict-aliasing" BIZARRE_OPTIMS="-fstrict-aliasing"
AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) AC_MSG_RESULT(yes), AC_MSG_RESULT(no))
dnl Check for -rdynamic flag dnl Check for -rdynamic flag
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vpar_headers.c : headers parsing * vpar_headers.c : headers parsing
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_headers.c,v 1.71 2001/01/16 17:59:23 massiot Exp $ * $Id: vpar_headers.c,v 1.72 2001/01/16 18:06:01 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Stphane Borel <stef@via.ecp.fr> * Stphane Borel <stef@via.ecp.fr>
...@@ -723,7 +723,7 @@ static void PictureHeader( vpar_thread_t * p_vpar ) ...@@ -723,7 +723,7 @@ static void PictureHeader( vpar_thread_t * p_vpar )
memset( p_vpar->picture.pp_mb, 0, MAX_MB*sizeof(macroblock_t *) ); memset( p_vpar->picture.pp_mb, 0, MAX_MB*sizeof(macroblock_t *) );
#endif #endif
/* FIXME ! remove asap ?? */ /* FIXME ! remove asap ?? */
memset( P_picture->p_data, 0, (p_vpar->sequence.i_mb_size*384)); //memset( P_picture->p_data, 0, (p_vpar->sequence.i_mb_size*384));
/* Update the reference pointers. */ /* Update the reference pointers. */
ReferenceUpdate( p_vpar, p_vpar->picture.i_coding_type, P_picture ); ReferenceUpdate( p_vpar, p_vpar->picture.i_coding_type, P_picture );
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vpar_synchro.c : frame dropping routines * vpar_synchro.c : frame dropping routines
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999, 2000 VideoLAN
* $Id: vpar_synchro.c,v 1.76 2001/01/16 17:59:23 massiot Exp $ * $Id: vpar_synchro.c,v 1.77 2001/01/16 18:06:01 massiot Exp $
* *
* Authors: Christophe Massiot <massiot@via.ecp.fr> * Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr> * Samuel Hocevar <sam@via.ecp.fr>
...@@ -231,7 +231,9 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type, ...@@ -231,7 +231,9 @@ boolean_t vpar_SynchroChoose( vpar_thread_t * p_vpar, int i_coding_type,
now = mdate(); now = mdate();
period = 1000000 * 1001 / p_vpar->sequence.i_frame_rate; period = 1000000 * 1001 / p_vpar->sequence.i_frame_rate;
vlc_mutex_lock( &p_vpar->p_vout->change_lock );
tau_yuv = p_vpar->p_vout->render_time; tau_yuv = p_vpar->p_vout->render_time;
vlc_mutex_unlock( &p_vpar->p_vout->change_lock );
vlc_mutex_lock( &p_vpar->synchro.fifo_lock ); vlc_mutex_lock( &p_vpar->synchro.fifo_lock );
......
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