Mercurial > mplayer.hg

changeset 32700:2821d9499621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move function declaration into vo_dxr2.h
author ranma
date Thu, 13 Jan 2011 17:37:16 +0000
parents 6d0b010a2bb7
children 02bc7c860503
files libao2/ao_dxr2.c libvo/vo_dxr2.c libvo/vo_dxr2.h
diffstat 3 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libao2/ao_dxr2.c	Wed Jan 12 22:47:40 2011 +0000
+++ b/libao2/ao_dxr2.c	Thu Jan 13 17:37:16 2011 +0000
@@ -175,9 +175,6 @@
     return y;
 }
 
-/* write_dxr2 from libvo/dxr2.c */
-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)
 {
 
--- a/libvo/vo_dxr2.c	Wed Jan 12 22:47:40 2011 +0000
+++ b/libvo/vo_dxr2.c	Thu Jan 13 17:37:16 2011 +0000
@@ -40,6 +40,7 @@
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/mpeg_packetizer.h"
 #include "x11_common.h"
+#include "libvo/vo_dxr2.h"
 
 #include <dxr2ioctl.h>
 
@@ -166,9 +167,6 @@
 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;
@@ -232,7 +230,7 @@
   write_dxr2(mpg_eof, sizeof(mpg_eof));
 }
 
-void dxr2_send_sub_packet(unsigned char* data,int len,int id,unsigned int timestamp) {
+static void dxr2_send_sub_packet(unsigned char* data,int len,int id,unsigned int timestamp) {
   int ptslen=5;
 
   if(dxr2_fd < 0) {
--- a/libvo/vo_dxr2.h	Wed Jan 12 22:47:40 2011 +0000
+++ b/libvo/vo_dxr2.h	Thu Jan 13 17:37:16 2011 +0000
@@ -25,4 +25,7 @@
 
 extern const m_option_t dxr2_opts[];
 
+/* exported for ao_dxr2.c */
+int write_dxr2(const unsigned char *data, int len);
+
 #endif /* MPLAYER_VO_DXR2_H */