# HG changeset patch # User diego # Date 1266446912 0 # Node ID 737b7fd47ef4d3ba7c818f72ac310eac6920636a # Parent 24a5dc9d1466f8484f422a5799d69bfdae96cae7 Add header for ty_ClearOSD(), ty_processuserdata(); avoids forward declarations. diff -r 24a5dc9d1466 -r 737b7fd47ef4 libmpdemux/demux_ty.c --- a/libmpdemux/demux_ty.c Wed Feb 17 22:40:50 2010 +0000 +++ b/libmpdemux/demux_ty.c Wed Feb 17 22:48:32 2010 +0000 @@ -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 @@ } TiVoInfo; off_t vstream_streamsize( ); -void ty_ClearOSD( int start ); // =========================================================================== #define TMF_SIG "showing.xml" diff -r 24a5dc9d1466 -r 737b7fd47ef4 libmpdemux/demux_ty_osd.c --- a/libmpdemux/demux_ty_osd.c Wed Feb 17 22:40:50 2010 +0000 +++ b/libmpdemux/demux_ty_osd.c Wed Feb 17 22:48:32 2010 +0000 @@ -26,6 +26,7 @@ //#include "subreader.h" #include "sub_cc.h" #include "libvo/sub.h" +#include "demux_ty_osd.h" //#include "dvdauth.h" diff -r 24a5dc9d1466 -r 737b7fd47ef4 libmpdemux/demux_ty_osd.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/demux_ty_osd.h Wed Feb 17 22:48:32 2010 +0000 @@ -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 -r 24a5dc9d1466 -r 737b7fd47ef4 libmpdemux/video.c --- a/libmpdemux/video.c Wed Feb 17 22:40:50 2010 +0000 +++ b/libmpdemux/video.c Wed Feb 17 22:48:32 2010 +0000 @@ -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 @@ 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 */