# HG changeset patch # User diego # Date 1277043920 0 # Node ID 0f5751eb71263075c1dfd3a07f1dbab7dac07e06 # Parent 563f02c25af90195c5c11780070a09c97bb38396 Add header file for VIVO extern variable declarations. diff -r 563f02c25af9 -r 0f5751eb7126 cfg-common.h --- a/cfg-common.h Sun Jun 20 14:17:06 2010 +0000 +++ b/cfg-common.h Sun Jun 20 14:25:20 2010 +0000 @@ -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 @@ {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[]={ diff -r 563f02c25af9 -r 0f5751eb7126 libmpdemux/demux_viv.c --- a/libmpdemux/demux_viv.c Sun Jun 20 14:17:06 2010 +0000 +++ b/libmpdemux/demux_viv.c Sun Jun 20 14:25:20 2010 +0000 @@ -32,6 +32,7 @@ #include "stream/stream.h" #include "demuxer.h" #include "stheader.h" +#include "demux_viv.h" /* parameters ! */ int vivo_param_version = -1; diff -r 563f02c25af9 -r 0f5751eb7126 libmpdemux/demux_viv.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libmpdemux/demux_viv.h Sun Jun 20 14:25:20 2010 +0000 @@ -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 */