Mercurial > mplayer.hg
changeset 31452:435530ed1a33
Move lavfopts_conf/mpegopts_conf/nuvopts_conf extern declarations to muxer.h.
| author | diego |
|---|---|
| date | Mon, 21 Jun 2010 14:43:08 +0000 |
| parents | b109d4fd7f3f |
| children | 91b713df588f |
| files | cfg-mencoder.h libmpdemux/muxer.h |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mencoder.h Mon Jun 21 14:40:28 2010 +0000 +++ b/cfg-mencoder.h Mon Jun 21 14:43:08 2010 +0000 @@ -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[];
--- a/libmpdemux/muxer.h Mon Jun 21 14:40:28 2010 +0000 +++ b/libmpdemux/muxer.h Mon Jun 21 14:43:08 2010 +0000 @@ -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 @@ 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)