diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:48:32 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:48:32 +0000 |
commit | c66aa21366043b81d263e453dda28ac50d573114 (patch) | |
tree | d5695b2ff33844c54748051b2593b8dbeae2a57c /libmpdemux | |
parent | 6f8c91b9a2094f8d52978359ac89841352ac9163 (diff) |
Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30619 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_ty.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ty_osd.c | 1 | ||||
-rw-r--r-- | libmpdemux/demux_ty_osd.h | 25 | ||||
-rw-r--r-- | libmpdemux/video.c | 3 |
4 files changed, 28 insertions, 3 deletions
diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index b784715e2f..67ff4f114e 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -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" diff --git a/libmpdemux/demux_ty_osd.c b/libmpdemux/demux_ty_osd.c index 9ae04ece5d..a9429d79c8 100644 --- a/libmpdemux/demux_ty_osd.c +++ b/libmpdemux/demux_ty_osd.c @@ -26,6 +26,7 @@ //#include "subreader.h" #include "sub_cc.h" #include "libvo/sub.h" +#include "demux_ty_osd.h" //#include "dvdauth.h" diff --git a/libmpdemux/demux_ty_osd.h b/libmpdemux/demux_ty_osd.h new file mode 100644 index 0000000000..3b81933759 --- /dev/null +++ b/libmpdemux/demux_ty_osd.h @@ -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 */ diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 6b507b0d57..482c3d6a7a 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -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 */ |