From ff93cd656b417416914adc656d8f7ab028cd7472 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 3 Apr 2010 14:20:34 +0000 Subject: Add a header for x264enc_set_param() instead of forward declaring it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30991 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 98ffc098d8..d9641955a3 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -23,6 +23,7 @@ * config for cfgparser */ +#include "libmpcodecs/ve_x264.h" #include "cfg-common.h" extern int sws_flags; @@ -35,9 +36,6 @@ 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[]; -- cgit v1.2.3 From 75fad5bac6ded52ae201f0b4f6d79d6318ae6bf0 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 4 Apr 2010 15:59:09 +0000 Subject: Mark encoder-related m_option_t struct arrays as const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2 --- cfg-mencoder.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'cfg-mencoder.h') diff --git a/cfg-mencoder.h b/cfg-mencoder.h index d9641955a3..6b8361260d 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -29,16 +29,16 @@ 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[]; -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}, -- cgit v1.2.3