[Mplayer-cvslog] CVS: main Makefile,1.152,1.153 codec-cfg.c,1.66,1.67 codec-cfg.h,1.40,1.41 configure,1.387,1.388 dec_video.c,1.101,1.102

[Zoltan Ponekker]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv5427

Modified Files:
	Makefile codec-cfg.c codec-cfg.h configure dec_video.c 
Log Message:
add initial mPNG support

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- Makefile	9 Feb 2002 20:05:49 -0000	1.152
+++ Makefile	11 Feb 2002 09:15:30 -0000	1.153
@@ -34,6 +34,10 @@
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
 
+ifeq ($(PNG),yes)
+SRCS_COMMON += mpng.c
+endif
+
 ifeq ($(VO2),yes)
 VO_LIBS = -Llibvo2 -lvo2
 VO_INC = -Ilibvo2

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- codec-cfg.c	9 Feb 2002 20:05:49 -0000	1.66
+++ codec-cfg.c	11 Feb 2002 09:15:30 -0000	1.67
@@ -246,6 +246,7 @@
 		"ducktm1",
 		"roqvideo",
 		"qtrpza",
+		"mpng",
 		NULL
 	};
         char **drv=audioflag?audiodrv:videodrv;

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- codec-cfg.h	9 Feb 2002 20:05:49 -0000	1.40
+++ codec-cfg.h	11 Feb 2002 09:15:30 -0000	1.41
@@ -58,6 +58,7 @@
 #define VFM_DUCKTM1 18
 #define VFM_ROQVIDEO 19
 #define VFM_QTRPZA 20
+#define VFM_MPNG 21
 
 #ifndef GUID_TYPE
 #define GUID_TYPE

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.387
retrieving revision 1.388
diff -u -r1.387 -r1.388
--- configure	10 Feb 2002 11:25:14 -0000	1.387
+++ configure	11 Feb 2002 09:15:30 -0000	1.388
@@ -1935,8 +1935,10 @@
   _ld_png='-lpng -lz'
   _vosrc="$_vosrc vo_png.c"
   _vomodules="png $_vomodules"
+  _mkf_png="yes"
 else
   _def_png='#undef HAVE_PNG'
+  _mkf_png="no"
 fi
 
 
@@ -2947,6 +2949,8 @@
 OPENDIVX = $_opendivx
 
 VO2 = $_vo2
+
+PNG = $_mkf_png
 
 EXTRA_LIB = $_ld_extra
 Z_LIB =  $_ld_static $_ld_zlib

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- dec_video.c	10 Feb 2002 01:23:36 -0000	1.101
+++ dec_video.c	11 Feb 2002 09:15:30 -0000	1.102
@@ -180,6 +180,16 @@
   int height,
   int bytes_per_pixel);
 
+#ifdef HAVE_PNG
+void decode_mpng(
+  unsigned char *encoded,
+  int encoded_size,
+  unsigned char *decoded,
+  int width,
+  int height,
+  int bytes_per_pixel);
+#endif
+
 void qt_decode_rpza(
   unsigned char *encoded,
   int encoded_size,
@@ -706,6 +716,9 @@
  case VFM_FLI:
  case VFM_QTRLE:
  case VFM_DUCKTM1:
+#ifdef HAVE_PNG
+ case VFM_MPNG:
+#endif
  case VFM_QTRPZA:
    {
 #ifdef USE_MP_IMAGE
@@ -1139,6 +1152,16 @@
         ((out_fmt&255)+7)/8);
     blit_frame = 3;
     break;
+#ifdef HAVE_PNG
+ case VFM_MPNG:
+    decode_mpng(
+        start, in_size, sh_video->our_out_buffer,
+	sh_video->disp_w,sh_video->disp_h,
+	24
+    );
+    blit_frame = 3;
+    break;
+#endif
  case VFM_CYUV:
    decode_cyuv(start, in_size, sh_video->our_out_buffer,
       sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255));