[MPlayer-dev-eng] main: [BUG?] draw_slice in vd_libmpeg2.c and [PATCH] some warning fixes

[Dominik Mierzejewski]

On Monday, 02 June 2003, Alex Beregszaszi wrote:
> Hi,
> 
> Could you post a new diff with the not yet commited parts?

Sure, here goes. I also moved yuv2rgb() and yuv2rgb_init() from rgb2rgb.h
to rgb2rgb.c and made it use MSG_FATAL().

-- 
MPlayer RPMs maintainer: http://www.piorunek.pl/~dominik/linux/pkgs/mplayer/
"The Universe doesn't give you any points for doing things that are easy."
        -- Sheridan to Garibaldi in Babylon 5:"The Geometry of Shadows"
-------------- next part --------------
--- MPlayer-20030603/libmpdemux/cache2.c.warn	Sun Jun  1 16:00:38 2003
+++ MPlayer-20030603/libmpdemux/cache2.c	Tue Jun  3 08:49:58 2003
@@ -15,6 +15,7 @@
 #include <string.h>
 #include <signal.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "../osdep/timer.h"
--- MPlayer-20030603/libmpdemux/stream.c.warn	Sun Jun  1 16:00:39 2003
+++ MPlayer-20030603/libmpdemux/stream.c	Tue Jun  3 08:49:58 2003
@@ -26,6 +26,7 @@
 
 
 extern int verbose; // defined in mplayer.c
+void cache_uninit(stream_t *s); // defined in cache2.c
 
 #include "cue_read.h"
 
--- MPlayer-20030603/libmpdemux/tv.c.warn	Thu May  1 16:06:30 2003
+++ MPlayer-20030603/libmpdemux/tv.c	Tue Jun  3 08:49:58 2003
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <ctype.h>
 #include <sys/time.h>
 
 #include "config.h"
--- MPlayer-20030603/libmpdemux/demux_ts.c.warn	Thu May  1 16:06:27 2003
+++ MPlayer-20030603/libmpdemux/demux_ts.c	Tue Jun  3 08:51:25 2003
@@ -199,6 +199,7 @@
     return size;
 }
 
+int ts_parse(demuxer_t * demuxer , ES_stream_t *es, unsigned char *packet);
 
 void ts_detect_streams(demuxer_t *demuxer)
 {
--- MPlayer-20030603/postproc/rgb2rgb.h.warn	Sun Jun  1 23:29:26 2003
+++ MPlayer-20030603/postproc/rgb2rgb.h	Tue Jun  3 08:49:58 2003
@@ -119,13 +119,9 @@
 static void yuv2rgb(uint8_t * image, uint8_t * py,
 			      uint8_t * pu, uint8_t * pv,
 			      unsigned h_size, unsigned v_size,
-			      int rgb_stride, int y_stride, int uv_stride){
-printf("broken, this should use the swscaler\n");
-}
+			      int rgb_stride, int y_stride, int uv_stride);
 
-static void yuv2rgb_init (unsigned bpp, int mode){
-printf("broken, this should use the swscaler\n");
-}
+static void yuv2rgb_init (unsigned bpp, int mode);
 
 void sws_rgb2rgb_init(int flags);
 
--- MPlayer-20030603/postproc/rgb2rgb.c.warn	Thu May  1 16:06:50 2003
+++ MPlayer-20030603/postproc/rgb2rgb.c	Tue Jun  3 08:49:58 2003
@@ -595,3 +595,14 @@
 	    dst[i] = ((b<<1)&0x07) | ((g&0x07)<<3) | ((r&0x03)<<6);
 	}
 }
+
+static void yuv2rgb(uint8_t * image, uint8_t * py,
+			      uint8_t * pu, uint8_t * pv,
+			      unsigned h_size, unsigned v_size,
+			      int rgb_stride, int y_stride, int uv_stride){
+MSG_FATAL("broken, this should use the swscaler\n");
+}
+
+static void yuv2rgb_init (unsigned bpp, int mode){
+MSG_FATAL("broken, this should use the swscaler\n");
+}