Merge svn changes up to r31004

10 files changed, 35 insertions, 10 deletions

diff --git a/libmpcodecs/ae_faac.c b/libmpcodecs/ae_faac.c
index 33c994757d..63c716378d 100644
--- a/libmpcodecs/ae_faac.c
+++ b/libmpcodecs/ae_faac.c
@@ -52,7 +52,7 @@ static unsigned long samples_input, max_bytes_output;
 static unsigned char *decoder_specific_buffer = NULL;
 static unsigned long decoder_specific_len = 0;
 
-m_option_t faacopts_conf[] = {
+const m_option_t faacopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"quality", &param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL},
 	{"object", &param_object_type, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index ec748d77c5..90ed31dfe7 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -106,7 +106,7 @@ static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_
 
 
 
-m_option_t lameopts_conf[]={
+const m_option_t lameopts_conf[] = {
 	{"q", &lame_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
 	{"aq", &lame_param_algqual, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
 	{"vbr", &lame_param_vbr, CONF_TYPE_INT, CONF_RANGE, 0, vbr_max_indicator, NULL},
diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c
index 851fa845f9..077b83d740 100644
--- a/libmpcodecs/ae_toolame.c
+++ b/libmpcodecs/ae_toolame.c
@@ -43,7 +43,7 @@ static int
 static float param_vbr = 0;
 static char *param_mode = "stereo";
 
-m_option_t toolameopts_conf[] = {
+const m_option_t toolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL},
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c
index e15206dee6..52e6ea8417 100644
--- a/libmpcodecs/ae_twolame.c
+++ b/libmpcodecs/ae_twolame.c
@@ -43,7 +43,7 @@ static int
 static float param_vbr = 0;
 static char *param_mode = "stereo";
 
-m_option_t twolameopts_conf[] = {
+const m_option_t twolameopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
 	{"mode", &param_mode, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"psy", &param_psy, CONF_TYPE_INT, CONF_RANGE, -1, 4, NULL},
diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c
index 064d34b5f0..febfa04a45 100644
--- a/libmpcodecs/ve_lavc.c
+++ b/libmpcodecs/ve_lavc.c
@@ -182,8 +182,7 @@ static char *lavc_param_avopt = NULL;
 
 #include "m_option.h"
 
-#ifdef CONFIG_LIBAVCODEC
-m_option_t lavcopts_conf[]={
+const m_option_t lavcopts_conf[]={
 	{"acodec", &lavc_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"abitrate", &lavc_param_abitrate, CONF_TYPE_INT, CONF_RANGE, 1, 1000000, NULL},
 	{"atag", &lavc_param_atag, CONF_TYPE_INT, CONF_RANGE, 0, 0xffff, NULL},
@@ -330,7 +329,6 @@ m_option_t lavcopts_conf[]={
         {"o", &lavc_param_avopt, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };
-#endif
 
 struct vf_priv_s {
     muxer_stream_t* mux;
diff --git a/libmpcodecs/ve_nuv.c b/libmpcodecs/ve_nuv.c
index 5f4a0a2808..83c848ffa1 100644
--- a/libmpcodecs/ve_nuv.c
+++ b/libmpcodecs/ve_nuv.c
@@ -71,7 +71,7 @@ struct vf_priv_s nuv_priv_dflt = {
   NULL,NULL
 };
 
-m_option_t nuvopts_conf[]={
+const m_option_t nuvopts_conf[] = {
   {"raw", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 0, 1, NULL},
   {"rtjpeg", &nuv_priv_dflt.raw, CONF_TYPE_FLAG, 0, 1, 0, NULL},
   {"lzo", &nuv_priv_dflt.lzo, CONF_TYPE_FLAG, 0, 0, 1, NULL},
diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c
index 4a84d5faa8..40a6d6ea0b 100644
--- a/libmpcodecs/ve_vfw.c
+++ b/libmpcodecs/ve_vfw.c
@@ -54,7 +54,7 @@ static HRESULT CoInitRes = -1;
 
 #include "m_option.h"
 
-m_option_t vfwopts_conf[]={
+const m_option_t vfwopts_conf[]={
     {"codec", &vfw_param_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"compdata", &vfw_param_compdata, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {NULL, NULL, 0, 0, 0, 0, NULL}
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c
index fc7ac6c1ff..832d58ac6a 100644
--- a/libmpcodecs/ve_x264.c
+++ b/libmpcodecs/ve_x264.c
@@ -45,6 +45,7 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
+#include "ve_x264.h"
 
 #include <x264.h>
 
diff --git a/libmpcodecs/ve_x264.h b/libmpcodecs/ve_x264.h
new file mode 100644
index 0000000000..93da150514
--- /dev/null
+++ b/libmpcodecs/ve_x264.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_X264_H
+#define MPLAYER_X264_H
+
+#include "m_option.h"
+
+void x264enc_set_param(const m_option_t* opt, char* arg);
+
+#endif /* MPLAYER_X264_H */
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c
index 858ca903f4..d724765ce5 100644
--- a/libmpcodecs/ve_xvid4.c
+++ b/libmpcodecs/ve_xvid4.c
@@ -216,7 +216,7 @@ static int xvidenc_autoaspect = 0;
 
 static char *xvidenc_zones = NULL; // zones string
 
-m_option_t xvidencopts_conf[] =
+const m_option_t xvidencopts_conf[] =
 {
 	/* Standard things mencoder should be able to treat directly */
 	{"bitrate", &xvidenc_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},