Mercurial > mplayer.hg
changeset 31451:b109d4fd7f3f
Move dvbin_opts_conf extern variable declaration to stream.h.
| author | diego |
|---|---|
| date | Mon, 21 Jun 2010 14:40:28 +0000 |
| parents | 8449d9eab838 |
| children | 435530ed1a33 |
| files | cfg-common.h stream/stream.h |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-common.h Mon Jun 21 14:39:24 2010 +0000 +++ b/cfg-common.h Mon Jun 21 14:40:28 2010 +0000 @@ -37,6 +37,7 @@ #include "stream/cdd.h" #include "stream/network.h" #include "stream/pvr.h" +#include "stream/stream.h" #include "stream/stream_dvd_common.h" #include "stream/stream_radio.h" #include "stream/tcp.h" @@ -149,8 +150,6 @@ }; #endif /* CONFIG_PVR */ -extern const m_option_t dvbin_opts_conf[]; - extern int rtsp_port; extern char *rtsp_destination;
--- a/stream/stream.h Mon Jun 21 14:39:24 2010 +0000 +++ b/stream/stream.h Mon Jun 21 14:40:28 2010 +0000 @@ -20,6 +20,7 @@ #define MPLAYER_STREAM_H #include "config.h" +#include "m_option.h" #include "mp_msg.h" #include "url.h" #include <string.h> @@ -339,6 +340,8 @@ extern char *cdrom_device; extern char *dvd_device; +extern const m_option_t dvbin_opts_conf[]; + typedef struct { int id; // 0 - 31 mpeg; 128 - 159 ac3; 160 - 191 pcm int language;