Mercurial > mplayer.hg
changeset 30580:a25d16882312
Add header file for store_ughvlc(); avoids forward declarations.
| author | diego |
|---|---|
| date | Wed, 17 Feb 2010 23:02:13 +0000 |
| parents | 7c6145c57bda |
| children | fef54a0e6ec2 |
| files | libmpdemux/demux_mov.c libmpdemux/demux_mov.h libmpdemux/demux_ogg.c |
| diffstat | 3 files changed, 26 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c Wed Feb 17 22:58:03 2010 +0000 +++ b/libmpdemux/demux_mov.c Wed Feb 17 23:02:13 2010 +0000 @@ -67,6 +67,7 @@ #include "libvo/sub.h" +#include "demux_mov.h" #include "qtpalette.h" #include "parse_mp4.h" // .MP4 specific stuff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/demux_mov.h Wed Feb 17 23:02:13 2010 +0000 @@ -0,0 +1,24 @@ +/* + * 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_MOV_H +#define MPLAYER_DEMUX_MOV_H + +unsigned int store_ughvlc(unsigned char *s, unsigned int v); + +#endif /* MPLAYER_DEMUX_MOV_H */
--- a/libmpdemux/demux_ogg.c Wed Feb 17 22:58:03 2010 +0000 +++ b/libmpdemux/demux_ogg.c Wed Feb 17 23:02:13 2010 +0000 @@ -31,6 +31,7 @@ #include "demuxer.h" #include "stheader.h" #include "libavutil/intreadwrite.h" +#include "demux_mov.h" #define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's') #define FOURCC_SPEEX mmioFOURCC('s', 'p', 'x', ' ') @@ -640,9 +641,6 @@ void print_wave_header(WAVEFORMATEX *h, int verbose_level); void print_video_header(BITMAPINFOHEADER *h, int verbose_level); -/* defined in demux_mov.c */ -unsigned int store_ughvlc(unsigned char *s, unsigned int v); - /** \brief Change the current subtitle stream and return its ID. \param demuxer The demuxer whose subtitle stream will be changed.