Merge svn changes up to r27399

Conflicts:

	libmpcodecs/vd.c
	libmpcodecs/ve_raw.c
	libvo/video_out.c
	libvo/x11_common.c
	mplayer.c

6 files changed, 26 insertions, 25 deletions

diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c
index fa3bbf4a46..3f191826fa 100644
--- a/libmpcodecs/ad.c
+++ b/libmpcodecs/ad.c
@@ -73,13 +73,13 @@ const ad_functions_t * const mpcodecs_ad_drivers[] =
 #ifdef CONFIG_QTX_CODECS
   &mpcodecs_ad_qtaudio,
 #endif
-#ifdef HAVE_FAAD
+#ifdef CONFIG_FAAD
   &mpcodecs_ad_faad,
 #endif
-#ifdef HAVE_OGGVORBIS
+#ifdef CONFIG_OGGVORBIS
   &mpcodecs_ad_libvorbis,
 #endif
-#ifdef HAVE_SPEEX
+#ifdef CONFIG_SPEEX
   &mpcodecs_ad_speex,
 #endif
 #ifdef CONFIG_LIBMAD
@@ -88,10 +88,10 @@ const ad_functions_t * const mpcodecs_ad_drivers[] =
 #ifdef CONFIG_REALCODECS
   &mpcodecs_ad_realaud,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
   &mpcodecs_ad_libdv,
 #endif
-#ifdef HAVE_MUSEPACK
+#ifdef CONFIG_MUSEPACK
   &mpcodecs_ad_libmusepack,
 #endif
 #ifdef CONFIG_LIBDCA
diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c
index f671f294dc..5e7b76b4e9 100644
--- a/libmpcodecs/ae.c
+++ b/libmpcodecs/ae.c
@@ -14,11 +14,11 @@
 
 #include "ae_pcm.h"
 
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 #include "ae_toolame.h"
 #endif
 
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 #include "ae_lame.h"
 #endif
 
@@ -26,11 +26,11 @@
 #include "ae_lavc.h"
 #endif
 
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
 #include "ae_faac.h"
 #endif
 
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
 #include "ae_twolame.h"
 #endif
 
@@ -50,7 +50,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params
 		case ACODEC_PCM:
 			ris = mpae_init_pcm(encoder);
 			break;
-#ifdef HAVE_TOOLAME
+#ifdef CONFIG_TOOLAME
 		case ACODEC_TOOLAME:
 			ris = mpae_init_toolame(encoder);
 			break;
@@ -60,17 +60,17 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params
 			ris = mpae_init_lavc(encoder);
 			break;
 #endif
-#ifdef HAVE_MP3LAME
+#ifdef CONFIG_MP3LAME
 		case ACODEC_VBRMP3:
 			ris = mpae_init_lame(encoder);
 			break;
 #endif
-#ifdef HAVE_FAAC
+#ifdef CONFIG_FAAC
 		case ACODEC_FAAC:
 			ris = mpae_init_faac(encoder);
 			break;
 #endif
-#ifdef HAVE_TWOLAME
+#ifdef CONFIG_TWOLAME
 		case ACODEC_TWOLAME:
 			ris = mpae_init_twolame(encoder);
 			break;
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c
index 80242dd351..c539d6ba6d 100644
--- a/libmpcodecs/ae_lame.c
+++ b/libmpcodecs/ae_lame.c
@@ -33,7 +33,7 @@ static int lame_param_free_format = 0; //disabled
 static int lame_param_br_min = 0; //not specified
 static int lame_param_br_max = 0; //not specified
 
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 int lame_param_fast=0; // unset
 static char* lame_param_preset=NULL; // unset
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name );
@@ -57,7 +57,7 @@ m_option_t lameopts_conf[]={
 	{"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
 	{"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL},
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 	{"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL},
 #else
@@ -178,7 +178,7 @@ int mpae_init_lame(audio_encoder_t *encoder)
     }
     if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq);
     if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq);
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
     if(lame_param_preset != NULL) {
         mp_msg(MSGT_MENCODER, MSGL_V, MSGTR_LamePresetEquals,lame_param_preset);
         if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0)
@@ -202,7 +202,7 @@ int mpae_init_lame(audio_encoder_t *encoder)
     return 1;
 }
 
-#ifdef HAVE_MP3LAME_PRESET
+#ifdef CONFIG_MP3LAME_PRESET
 /* lame_presets_set 
    taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */
 static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name )
@@ -253,7 +253,7 @@ static int  lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_
         preset_name = "256";
     }
 
-#ifdef HAVE_MP3LAME_PRESET_MEDIUM
+#ifdef CONFIG_MP3LAME_PRESET_MEDIUM
     if (strcmp(preset_name, "medium") == 0) {
         if (fast > 0)
            lame_set_preset(gfp, MEDIUM_FAST);
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 835f809f98..e8c02798ab 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -52,7 +52,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
 #ifdef CONFIG_LIBAVCODEC
     &mpcodecs_vd_ffmpeg,
 #endif
-#ifdef HAVE_OGGTHEORA
+#ifdef CONFIG_OGGTHEORA
     &mpcodecs_vd_theora,
 #endif
 #ifdef CONFIG_WIN32DLL
@@ -86,10 +86,10 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
 #ifdef CONFIG_REALCODECS
     &mpcodecs_vd_realvid,
 #endif
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
     &mpcodecs_vd_xvid,
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
     &mpcodecs_vd_libdv,
 #endif
 #ifdef CONFIG_QTX_CODECS
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c
index 5d88a0fd77..9d083f5d86 100644
--- a/libmpcodecs/ve.c
+++ b/libmpcodecs/ve.c
@@ -32,17 +32,17 @@ static vf_info_t* encoder_list[]={
     &ve_info_qtvideo,
 #endif
 #endif
-#ifdef HAVE_LIBDV095
+#ifdef CONFIG_LIBDV095
     &ve_info_libdv,
 #endif
     &ve_info_raw,
-#ifdef HAVE_XVID4
+#ifdef CONFIG_XVID4
     &ve_info_xvid,
 #endif
 #ifdef CONFIG_LIBLZO
     &ve_info_nuv,
 #endif
-#ifdef HAVE_X264
+#ifdef CONFIG_X264
     &ve_info_x264,
 #endif
     /* Please do not add any new encoders here. If you want to implement a new
diff --git a/libmpcodecs/ve_raw.c b/libmpcodecs/ve_raw.c
index d0f54df81b..225fd3bfaf 100644
--- a/libmpcodecs/ve_raw.c
+++ b/libmpcodecs/ve_raw.c
@@ -27,7 +27,8 @@ struct vf_priv_s {
 #define mux_v (vf->priv->mux)
 
 static int set_format(struct vf_instance *vf, unsigned int fmt) {
-    mux_v->bih->biCompression = fmt;
+    if (!force_fourcc)
+        mux_v->bih->biCompression = fmt;
     
     mux_v->bih->biPlanes = 1;
     if (IMGFMT_IS_RGB(fmt)) {