Mercurial > mplayer.hg
changeset 31438:3afcf20a13e4
Move faac/lame/toolame/twolame option array declarations to appropriate headers.
| author | diego |
|---|---|
| date | Mon, 21 Jun 2010 09:51:26 +0000 |
| parents | 327eedc724c5 |
| children | c0d4771c11c7 |
| files | cfg-mencoder.h libmpcodecs/ae_faac.h libmpcodecs/ae_lame.h libmpcodecs/ae_toolame.h libmpcodecs/ae_twolame.h |
| diffstat | 5 files changed, 17 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mencoder.h Mon Jun 21 09:42:28 2010 +0000 +++ b/cfg-mencoder.h Mon Jun 21 09:51:26 2010 +0000 @@ -23,18 +23,18 @@ * config for cfgparser */ +#include "libmpcodecs/ae_faac.h" +#include "libmpcodecs/ae_lame.h" +#include "libmpcodecs/ae_toolame.h" +#include "libmpcodecs/ae_twolame.h" #include "libmpcodecs/ve_x264.h" #include "libmpdemux/muxer_avi.h" #include "cfg-common.h" -extern const m_option_t faacopts_conf[]; -extern const m_option_t lameopts_conf[]; 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 toolameopts_conf[]; -extern const m_option_t twolameopts_conf[]; extern const m_option_t vfwopts_conf[]; extern const m_option_t xvidencopts_conf[];
--- a/libmpcodecs/ae_faac.h Mon Jun 21 09:42:28 2010 +0000 +++ b/libmpcodecs/ae_faac.h Mon Jun 21 09:51:26 2010 +0000 @@ -19,8 +19,11 @@ #ifndef MPLAYER_AE_FAAC_H #define MPLAYER_AE_FAAC_H +#include "libmpdemux/muxer.h" #include "ae.h" -#include "libmpdemux/muxer.h" +#include "m_option.h" + +extern const m_option_t faacopts_conf[]; int mpae_init_faac(audio_encoder_t *encoder);
--- a/libmpcodecs/ae_lame.h Mon Jun 21 09:42:28 2010 +0000 +++ b/libmpcodecs/ae_lame.h Mon Jun 21 09:51:26 2010 +0000 @@ -20,6 +20,9 @@ #define MPLAYER_AE_LAME_H #include "ae.h" +#include "m_option.h" + +extern const m_option_t lameopts_conf[]; int mpae_init_lame(audio_encoder_t *encoder);
--- a/libmpcodecs/ae_toolame.h Mon Jun 21 09:42:28 2010 +0000 +++ b/libmpcodecs/ae_toolame.h Mon Jun 21 09:51:26 2010 +0000 @@ -20,6 +20,9 @@ #define MPLAYER_AE_TOOLAME_H #include "ae.h" +#include "m_option.h" + +extern const m_option_t toolameopts_conf[]; int mpae_init_toolame(audio_encoder_t *encoder);
--- a/libmpcodecs/ae_twolame.h Mon Jun 21 09:42:28 2010 +0000 +++ b/libmpcodecs/ae_twolame.h Mon Jun 21 09:51:26 2010 +0000 @@ -20,6 +20,9 @@ #define MPLAYER_AE_TWOLAME_H #include "ae.h" +#include "m_option.h" + +extern const m_option_t twolameopts_conf[]; int mpae_init_twolame(audio_encoder_t *encoder);