Mercurial > mplayer.hg

changeset 31439:c0d4771c11c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move demuxer-specific option array declarations to demuxer.h.
author diego
date Mon, 21 Jun 2010 09:55:59 +0000
parents 3afcf20a13e4
children 01340407202e
files cfg-common.h libmpdemux/demuxer.h
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/cfg-common.h	Mon Jun 21 09:51:26 2010 +0000
+++ b/cfg-common.h	Mon Jun 21 09:55:59 2010 +0000
@@ -50,11 +50,6 @@
 #include "stream/cdd.h"
 #endif
 
-/* defined in libmpdemux: */
-extern const m_option_t demux_rawaudio_opts[];
-extern const m_option_t demux_rawvideo_opts[];
-
-
 #include "stream/tv.h"
 #include "stream/stream_radio.h"
 
@@ -159,7 +154,6 @@
 #endif /* CONFIG_PVR */
 
 extern const m_config_t dvbin_opts_conf[];
-extern const m_option_t lavfdopts_conf[];
 
 extern int rtsp_port;
 extern char *rtsp_destination;
--- a/libmpdemux/demuxer.h	Mon Jun 21 09:51:26 2010 +0000
+++ b/libmpdemux/demuxer.h	Mon Jun 21 09:55:59 2010 +0000
@@ -28,6 +28,7 @@
 #ifdef CONFIG_ASS
 #include "libass/ass_mp.h"
 #endif
+#include "m_option.h"
 
 #ifdef HAVE_BUILTIN_EXPECT
 #define likely(x) __builtin_expect ((x) != 0, 1)
@@ -187,6 +188,11 @@
 extern int rtsp_transport_sctp;
 extern int rtsp_transport_tcp;
 
+extern const m_option_t demux_rawaudio_opts[];
+extern const m_option_t demux_rawvideo_opts[];
+extern const m_option_t lavfdopts_conf[];
+
+
 /**
  * Demuxer description structure
  */