[MPlayer-cvslog] r31518 - in trunk: cfg-mencoder.h libmpdemux/muxer.h

[diego]

Author: diego
Date: Mon Jun 21 16:43:08 2010
New Revision: 31518

Log:
Move lavfopts_conf/mpegopts_conf/nuvopts_conf extern declarations to muxer.h.

Modified:
   trunk/cfg-mencoder.h
   trunk/libmpdemux/muxer.h

Modified: trunk/cfg-mencoder.h
==============================================================================
--- trunk/cfg-mencoder.h	Mon Jun 21 16:40:28 2010	(r31517)
+++ trunk/cfg-mencoder.h	Mon Jun 21 16:43:08 2010	(r31518)
@@ -28,13 +28,11 @@
 #include "libmpcodecs/ae_toolame.h"
 #include "libmpcodecs/ae_twolame.h"
 #include "libmpcodecs/ve_x264.h"
+#include "libmpdemux/muxer.h"
 #include "libmpdemux/muxer_avi.h"
 #include "cfg-common.h"
 
 extern const m_option_t lavcopts_conf[];
-extern const m_option_t lavfopts_conf[];
-extern const m_option_t mpegopts_conf[];
-extern const m_option_t nuvopts_conf[];
 extern const m_option_t vfwopts_conf[];
 extern const m_option_t xvidencopts_conf[];
 

Modified: trunk/libmpdemux/muxer.h
==============================================================================
--- trunk/libmpdemux/muxer.h	Mon Jun 21 16:40:28 2010	(r31517)
+++ trunk/libmpdemux/muxer.h	Mon Jun 21 16:43:08 2010	(r31518)
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include "aviheader.h"
+#include "m_option.h"
 #include "ms_hdr.h"
 #include "stream/stream.h"
 
@@ -127,6 +128,10 @@ typedef struct muxbuf_t {
 
 extern char *force_fourcc;
 
+extern const m_option_t lavfopts_conf[];
+extern const m_option_t mpegopts_conf[];
+extern const m_option_t nuvopts_conf[];
+
 muxer_t *muxer_new_muxer(int type,stream_t *stream);
 #define muxer_new_stream(muxer,a) muxer->cont_new_stream(muxer,a)
 #define muxer_stream_fix_parameters(muxer, a) muxer->fix_stream_parameters(a)