[MPlayer-cvslog] r32787 - in trunk: libao2/ao_dxr2.c libvo/vo_dxr2.c libvo/vo_dxr2.h
ranma
subversion at mplayerhq.hu
Thu Jan 13 18:37:16 CET 2011
Author: ranma
Date: Thu Jan 13 18:37:16 2011
New Revision: 32787
Log:
move function declaration into vo_dxr2.h
Modified:
trunk/libao2/ao_dxr2.c
trunk/libvo/vo_dxr2.c
trunk/libvo/vo_dxr2.h
Modified: trunk/libao2/ao_dxr2.c
==============================================================================
--- trunk/libao2/ao_dxr2.c Wed Jan 12 23:47:40 2011 (r32786)
+++ trunk/libao2/ao_dxr2.c Thu Jan 13 18:37:16 2011 (r32787)
@@ -175,9 +175,6 @@ static int get_space(void){
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)
{
Modified: trunk/libvo/vo_dxr2.c
==============================================================================
--- trunk/libvo/vo_dxr2.c Wed Jan 12 23:47:40 2011 (r32786)
+++ trunk/libvo/vo_dxr2.c Thu Jan 13 18:37:16 2011 (r32787)
@@ -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 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;
@@ -232,7 +230,7 @@ static void dxr2_send_eof(void)
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) {
Modified: trunk/libvo/vo_dxr2.h
==============================================================================
--- trunk/libvo/vo_dxr2.h Wed Jan 12 23:47:40 2011 (r32786)
+++ trunk/libvo/vo_dxr2.h Thu Jan 13 18:37:16 2011 (r32787)
@@ -25,4 +25,7 @@ extern int dxr2_fd;
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 */
More information about the MPlayer-cvslog
mailing list