[MPlayer-cvslog] r30619 - in trunk/libmpdemux: demux_ty.c demux_ty_osd.c demux_ty_osd.h video.c

[diego]

Author: diego
Date: Wed Feb 17 23:48:32 2010
New Revision: 30619

Log:
Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations.

Added:
   trunk/libmpdemux/demux_ty_osd.h
Modified:
   trunk/libmpdemux/demux_ty.c
   trunk/libmpdemux/demux_ty_osd.c
   trunk/libmpdemux/video.c

Modified: trunk/libmpdemux/demux_ty.c
==============================================================================
--- trunk/libmpdemux/demux_ty.c	Wed Feb 17 23:40:50 2010	(r30618)
+++ trunk/libmpdemux/demux_ty.c	Wed Feb 17 23:48:32 2010	(r30619)
@@ -41,6 +41,7 @@
 
 #include "stream/stream.h"
 #include "demuxer.h"
+#include "demux_ty_osd.h"
 #include "parse_es.h"
 #include "stheader.h"
 #include "sub_cc.h"
@@ -105,7 +106,6 @@ typedef struct
 } TiVoInfo;
 
 off_t vstream_streamsize( );
-void ty_ClearOSD( int start );
 
 // ===========================================================================
 #define TMF_SIG "showing.xml"

Modified: trunk/libmpdemux/demux_ty_osd.c
==============================================================================
--- trunk/libmpdemux/demux_ty_osd.c	Wed Feb 17 23:40:50 2010	(r30618)
+++ trunk/libmpdemux/demux_ty_osd.c	Wed Feb 17 23:48:32 2010	(r30619)
@@ -26,6 +26,7 @@
 //#include "subreader.h"
 #include "sub_cc.h"
 #include "libvo/sub.h"
+#include "demux_ty_osd.h"
 
 //#include "dvdauth.h"
 

Added: trunk/libmpdemux/demux_ty_osd.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_ty_osd.h	Wed Feb 17 23:48:32 2010	(r30619)
@@ -0,0 +1,25 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_DEMUX_TY_OSD_H
+#define MPLAYER_DEMUX_TY_OSD_H
+
+void ty_ClearOSD(int start);
+void ty_processuserdata(unsigned char *buf, int len);
+
+#endif /* MPLAYER_DEMUX_TY_OSD_H */

Modified: trunk/libmpdemux/video.c
==============================================================================
--- trunk/libmpdemux/video.c	Wed Feb 17 23:40:50 2010	(r30618)
+++ trunk/libmpdemux/video.c	Wed Feb 17 23:48:32 2010	(r30619)
@@ -33,6 +33,7 @@
 
 #include "stream/stream.h"
 #include "demuxer.h"
+#include "demux_ty_osd.h"
 #include "stheader.h"
 #include "parse_es.h"
 #include "mpeg_hdr.h"
@@ -405,8 +406,6 @@ mpeg_header_parser:
 return 1;
 }
 
-void ty_processuserdata( unsigned char* buf, int len );
-
 static void process_userdata(unsigned char* buf,int len){
     int i;
     /* if the user data starts with "CC", assume it is a CC info packet */