[MPlayer-cvslog] r30622 - in trunk/libmpdemux: demux_mov.c demux_mov.h demux_ogg.c

[diego]

Author: diego
Date: Thu Feb 18 00:02:13 2010
New Revision: 30622

Log:
Add header file for store_ughvlc(); avoids forward declarations.

Added:
   trunk/libmpdemux/demux_mov.h
Modified:
   trunk/libmpdemux/demux_mov.c
   trunk/libmpdemux/demux_ogg.c

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	Wed Feb 17 23:58:03 2010	(r30621)
+++ trunk/libmpdemux/demux_mov.c	Thu Feb 18 00:02:13 2010	(r30622)
@@ -67,6 +67,7 @@
 
 #include "libvo/sub.h"
 
+#include "demux_mov.h"
 #include "qtpalette.h"
 #include "parse_mp4.h" // .MP4 specific stuff
 

Added: trunk/libmpdemux/demux_mov.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_mov.h	Thu Feb 18 00:02:13 2010	(r30622)
@@ -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 */

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	Wed Feb 17 23:58:03 2010	(r30621)
+++ trunk/libmpdemux/demux_ogg.c	Thu Feb 18 00:02:13 2010	(r30622)
@@ -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(demuxe
 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.