[MPlayer-cvslog] r32780 - in trunk: libao2/ao_dxr2.c libvo/vo_dxr2.c

[ranma]

Author: ranma
Date: Tue Jan 11 01:09:59 2011
New Revision: 32780

Log:
Fix compiler warnings in ao_dxr2.c and vo_dxr2.c

Modified:
   trunk/libao2/ao_dxr2.c
   trunk/libvo/vo_dxr2.c

Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c	Tue Jan 11 01:07:52 2011	(r32779)
+++ trunk/libao2/ao_dxr2.c	Tue Jan 11 01:09:59 2011	(r32780)
@@ -175,9 +175,11 @@ static int get_space(void){
     return y;
 }
 
+/* write_dxr2 from libvo/dxr2.c */
+extern int write_dxr2(const unsigned char *data, int len);
+
 static void dxr2_send_lpcm_packet(unsigned char* data,int len,int id,unsigned int timestamp,int freq_id)
 {
-  int write_dxr2(const unsigned char *data, int len);
 
   if(dxr2_fd < 0) {
     mp_msg(MSGT_AO,MSGL_ERR,"DXR2 fd is not valid\n");
@@ -196,7 +198,6 @@ static void dxr2_send_lpcm_packet(unsign
 // it should round it down to outburst*n
 // return: number of bytes played
 static int play(void* data,int len,int flags){
-  int write_dxr2(const unsigned char *data, int len);
 
   // MPEG and AC3 don't work :-(
     if(ao_data.format==AF_FORMAT_MPEG2)

Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c	Tue Jan 11 01:07:52 2011	(r32779)
+++ trunk/libvo/vo_dxr2.c	Tue Jan 11 01:09:59 2011	(r32780)
@@ -166,6 +166,9 @@ static char *ucodesearchpath[] = {
 static unsigned char dxr2buf[BUF_SIZE];
 static unsigned int  dxr2bufpos = 0;
 
+int write_dxr2(const unsigned char *data, int len);
+void dxr2_send_sub_packet(unsigned char* data,int len,int id,unsigned int timestamp);
+
 int write_dxr2(const unsigned char *data, int len)
 {
   int w = 0;
@@ -460,7 +463,6 @@ static void dxr2_set_overlay_window(void
   uint8_t* src[] = { sub_img, NULL, NULL };
   int stride[] = { movie_w * 3 , 0, 0 };
   dxr2_twoArg_t win;
-  int redisp = 0;
   int cc = vo_config_count;
   vo_config_count = sub_config_count;
   sub_vo->draw_slice(src,stride,movie_w,movie_h,0,0);