[Mplayer-cvslog] CVS: main dec_audio.c,1.50,1.51 dec_video.c,1.54,1.55 dec_video.h,1.1,1.2 mplayer.c,1.308,1.309 xacodec.h,1.2,1.3

[Arpi of Ize]

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

Modified Files:
	dec_audio.c dec_video.c dec_video.h mplayer.c xacodec.h 
Log Message:
more cleanup, warnings fixed

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- dec_audio.c	29 Oct 2001 22:40:46 -0000	1.50
+++ dec_audio.c	30 Oct 2001 17:38:09 -0000	1.51
@@ -7,20 +7,20 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-#include "libao2/afmt.h"
-
 extern int verbose; // defined in mplayer.c
 
-#ifdef USE_FAKE_MONO
-int fakemono=0;
-#endif
-
 #include "stream.h"
 #include "demuxer.h"
 
 #include "codec-cfg.h"
 #include "stheader.h"
 
+#include "dec_audio.h"
+
+//==========================================================================
+
+#include "libao2/afmt.h"
+
 #include "dll_init.h"
 
 #include "mp3lib/mp3.h"
@@ -33,6 +33,10 @@
 #include "ac3-iec958.h"
 
 #include "ima4.h"
+
+#ifdef USE_FAKE_MONO
+int fakemono=0;
+#endif
 
 #ifdef USE_DIRECTSHOW
 #include "loader/DirectShow/DS_AudioDec.h"

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- dec_video.c	29 Oct 2001 20:28:06 -0000	1.54
+++ dec_video.c	30 Oct 2001 17:38:09 -0000	1.55
@@ -1,6 +1,4 @@
 
-#define USE_XANIM
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -9,17 +7,11 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 
-extern int verbose; // defined in mplayer.c
-extern int divx_quality;
-
-extern double video_time_usage;
-extern double vout_time_usage;
-
-extern int frameratecode2framerate[16];
-
 #include "linux/timer.h"
 #include "linux/shmem.h"
 
+extern int verbose; // defined in mplayer.c
+
 #include "stream.h"
 #include "demuxer.h"
 #include "parse_es.h"
@@ -27,17 +19,26 @@
 #include "codec-cfg.h"
 #include "stheader.h"
 
-#include "dll_init.h"
-
-//#include <inttypes.h>
-//#include "libvo/img_format.h"
-
 #ifdef USE_LIBVO2
 #include "libvo2/libvo2.h"
 #else
 #include "libvo/video_out.h"
 #endif
 
+#include "dec_video.h"
+
+// ===================================================================
+
+extern double video_time_usage;
+extern double vout_time_usage;
+
+extern int frameratecode2framerate[16];
+
+#include "dll_init.h"
+
+//#include <inttypes.h>
+//#include "libvo/img_format.h"
+
 #include "libmpeg2/mpeg2.h"
 #include "libmpeg2/mpeg2_internal.h"
 
@@ -45,6 +46,7 @@
 
 extern picture_t *picture;	// exported from libmpeg2/decode.c
 
+int divx_quality=0;
 
 #ifdef USE_DIRECTSHOW
 #include "loader/DirectShow/DS_VideoDec.h"
@@ -71,6 +73,8 @@
 #include <decore.h>
 #endif
 
+#define USE_XANIM
+
 #ifdef USE_XANIM
 #include "xacodec.h"
 #endif
@@ -224,6 +228,11 @@
     case VFM_MPEG:
 	mpeg2_free_image_buffers (picture);
 	break;
+#ifdef USE_XANIM
+    case VFM_XANIM:
+	xacodec_exit();
+	break;
+#endif
     }
     if(sh_video->our_out_buffer){
 	free(sh_video->our_out_buffer);

Index: dec_video.h
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dec_video.h	30 Oct 2001 17:04:59 -0000	1.1
+++ dec_video.h	30 Oct 2001 17:38:09 -0000	1.2
@@ -15,3 +15,5 @@
 extern void set_video_quality(sh_video_t *sh_video,int quality);
 
 int set_video_colors(sh_video_t *sh_video,char *item,int value);
+
+extern int divx_quality;

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -r1.308 -r1.309
--- mplayer.c	30 Oct 2001 17:04:59 -0000	1.308
+++ mplayer.c	30 Oct 2001 17:38:09 -0000	1.309
@@ -97,6 +97,9 @@
 #include "stheader.h"
 #include "parse_es.h"
 
+#include "dec_audio.h"
+#include "dec_video.h"
+
 extern picture_t *picture;	// exported from libmpeg2/decode.c
 
 int frameratecode2framerate[16] = {
@@ -132,8 +135,6 @@
 // static int play_in_bg=0;
 
 // options:
-
-int divx_quality=0;
 static int auto_quality=0;
 static int output_quality=0;
 

Index: xacodec.h
===================================================================
RCS file: /cvsroot/mplayer/main/xacodec.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xacodec.h	22 Oct 2001 22:45:06 -0000	1.2
+++ xacodec.h	30 Oct 2001 17:38:09 -0000	1.3
@@ -112,3 +112,7 @@
     unsigned char *mem;
 } xacodec_image_t;
 
+int xacodec_init_video(sh_video_t *vidinfo, int out_format);
+xacodec_image_t* xacodec_decode_frame(uint8_t *frame, int frame_size, int skip_flag);
+int xacodec_exit();
+