[MPlayer-cvslog] r31479 - in trunk: cfg-common.h libmpdemux/demux_viv.c libmpdemux/demux_viv.h

[diego]

Author: diego
Date: Sun Jun 20 16:25:20 2010
New Revision: 31479

Log:
Add header file for VIVO extern variable declarations.

Added:
   trunk/libmpdemux/demux_viv.h
Modified:
   trunk/cfg-common.h
   trunk/libmpdemux/demux_viv.c

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 16:17:06 2010	(r31478)
+++ trunk/cfg-common.h	Sun Jun 20 16:25:20 2010	(r31479)
@@ -30,6 +30,7 @@
 #include "libmpcodecs/dec_video.h"
 #include "libmpcodecs/vd.h"
 #include "libmpdemux/demux_ts.h"
+#include "libmpdemux/demux_viv.h"
 #include "libmpdemux/demuxer.h"
 #include "osdep/priority.h"
 #include "stream/network.h"
@@ -193,15 +194,6 @@ const m_option_t scaler_filter_conf[]={
     {NULL, NULL, 0, 0, 0, 0, NULL}
 };
 
-/* VIVO demuxer options: */
-extern int vivo_param_version;
-extern char *vivo_param_acodec;
-extern int vivo_param_abitrate;
-extern int vivo_param_samplerate;
-extern int vivo_param_bytesperblock;
-extern int vivo_param_width;
-extern int vivo_param_height;
-extern int vivo_param_vformat;
 extern char *cdrom_device;
 
 const m_option_t vivoopts_conf[]={

Modified: trunk/libmpdemux/demux_viv.c
==============================================================================
--- trunk/libmpdemux/demux_viv.c	Sun Jun 20 16:17:06 2010	(r31478)
+++ trunk/libmpdemux/demux_viv.c	Sun Jun 20 16:25:20 2010	(r31479)
@@ -32,6 +32,7 @@
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
+#include "demux_viv.h"
 
 /* parameters ! */
 int vivo_param_version = -1;

Added: trunk/libmpdemux/demux_viv.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libmpdemux/demux_viv.h	Sun Jun 20 16:25:20 2010	(r31479)
@@ -0,0 +1,32 @@
+/*
+ * 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_VIV_H
+#define MPLAYER_DEMUX_VIV_H
+
+extern char *vivo_param_acodec;
+
+extern int vivo_param_abitrate;
+extern int vivo_param_bytesperblock;
+extern int vivo_param_height;
+extern int vivo_param_samplerate;
+extern int vivo_param_version;
+extern int vivo_param_vformat;
+extern int vivo_param_width;
+
+#endif /* MPLAYER_DEMUX_VIV_H */