diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:54:52 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 17:55:05 +0300 |
| commit | e913d6c5dabcf342d8c1a7070382d712fc354948 (patch) | |
| tree | 965b5b698c7075e53123593eb4b5bfdb45d78c56 /cfg-mencoder.h | |
| parent | be935e27666d8fdbf387adb1fcc30d243f6359dc (diff) | |
| parent | 00959d5cf76d4ad94de9d0022b7b40a58acf2b95 (diff) | |
| download | mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.bz2 mpv-e913d6c5dabcf342d8c1a7070382d712fc354948.tar.xz | |
Merge svn changes up to r31004
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index ac2ffd8e10..c067bcc8d7 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -23,24 +23,22 @@ * config for cfgparser */ +#include "libmpcodecs/ve_x264.h" #include "cfg-common.h" extern int sws_flags; extern char *pp_help; -extern m_option_t lameopts_conf[]; -extern m_option_t lavcopts_conf[]; -extern m_option_t toolameopts_conf[]; -extern m_option_t twolameopts_conf[]; -extern m_option_t faacopts_conf[]; -extern m_option_t vfwopts_conf[]; -extern m_option_t xvidencopts_conf[]; - -void x264enc_set_param(const m_option_t* opt, char* arg); - -extern m_option_t nuvopts_conf[]; -extern m_option_t mpegopts_conf[]; -extern m_option_t lavfopts_conf[]; +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[]; const m_option_t ovc_conf[]={ {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL}, |