summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-17 23:02:13 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-17 23:02:13 +0000
commitd28c27df8d038c42c5da75946e6053daeb8031d9 (patch)
tree597d8c09c79989f5cc057790533dd15fb82d9659 /libmpdemux
parent4a9770c1c27b146bac553502cfacd11ae5ead0df (diff)
downloadmpv-d28c27df8d038c42c5da75946e6053daeb8031d9.tar.bz2
mpv-d28c27df8d038c42c5da75946e6053daeb8031d9.tar.xz
Add header file for store_ughvlc(); avoids forward declarations.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30622 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mov.c1
-rw-r--r--libmpdemux/demux_mov.h24
-rw-r--r--libmpdemux/demux_ogg.c4
3 files changed, 26 insertions, 3 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 3848cf1903..a8ca20f211 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -67,6 +67,7 @@
#include "libvo/sub.h"
+#include "demux_mov.h"
#include "qtpalette.h"
#include "parse_mp4.h" // .MP4 specific stuff
diff --git a/libmpdemux/demux_mov.h b/libmpdemux/demux_mov.h
new file mode 100644
index 0000000000..8aa515c349
--- /dev/null
+++ b/libmpdemux/demux_mov.h
@@ -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 */
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index d0a462347a..a72600243f 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -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 @@ static void demux_ogg_scan_stream(demuxer_t *demuxer)
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.