* vlc.init becomes ~/.vlcrc

[vlc] / src / video_decoder / video_decoder.c

diff --git a/src/video_decoder/video_decoder.c b/src/video_decoder/video_decoder.c
index 4f59d0b999881c9221bfb044000e7e45fdee095c..acca7dad72d7b5d1631a9d21cd2c00375381d448 100644 (file)
--- a/src/video_decoder/video_decoder.c
+++ b/src/video_decoder/video_decoder.c
@@ -1,6 +1,23 @@
 /*****************************************************************************
  * video_decoder.c : video decoder thread
- * (c)1999 VideoLAN
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
 /* FIXME: passer en terminate/destroy avec les signaux supplémentaires ?? */
@@ -8,25 +25,22 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-//#include "vlc.h"
+#include "defs.h"
 
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
+#include <stdlib.h>                                                /* free() */
+#include <unistd.h>                                              /* getpid() */
+#include <sys/types.h>                        /* on BSD, uio.h needs types.h */
+#include <sys/uio.h>                                          /* for input.h */
 
 #include "config.h"
 #include "common.h"
+#include "threads.h"
 #include "mtime.h"
-#include "vlc_thread.h"
+#include "plugins.h"
 
 #include "intf_msg.h"
-#include "debug.h"                 /* XXX?? temporaire, requis par netlist.h */
 
 #include "input.h"
-#include "input_netlist.h"
 #include "decoder_fifo.h"
 #include "video.h"
 #include "video_output.h"
@@ -195,7 +209,7 @@ static void ErrorThread( vdec_thread_t *p_vdec )
 /*****************************************************************************
  * EndThread: thread destruction
  *****************************************************************************
- * This function is called when the thread ends after a sucessfull
+ * This function is called when the thread ends after a sucessful
  * initialization.
  *****************************************************************************/
 static void EndThread( vdec_thread_t *p_vdec )
@@ -308,8 +322,8 @@ static __inline__ void AddBlock( vdec_thread_t * p_vdec, dctelem_t * p_block,
             "packuswb   %%mm1,%%mm2\n\t"
             "movq       %%mm2,(%0)\n\t"
 
-            "emms"
-             :"+r" (p_data): "r" (p_block),"r" (i_incr+8));
+            //"emms"
+            :"+r" (p_data): "r" (p_block),"r" (i_incr+8));
 }
 #endif
 
@@ -375,7 +389,7 @@ static  __inline__ void CopyBlock( vdec_thread_t * p_vdec, dctelem_t * p_block,
             "movq        112(%1),%%mm0\n\t"
             "packuswb   120(%1),%%mm0\n\t"
             "movq        %%mm0,(%0)\n\t"
-            "emms"
+            //"emms"
             :"+r" (p_data): "r" (p_block),"r" (i_incr+8));
 }
 #endif
@@ -445,7 +459,7 @@ void vdec_DecodeMacroblock( vdec_thread_t *p_vdec, macroblock_t * p_mb )
          */
         if( p_mb->pf_motion == 0 )
         {
-            fprintf( stderr, "vdec error: pf_motion set to NULL\n" );
+            intf_ErrMsg( "vdec error: pf_motion set to NULL\n" );
         }
         else
         {