Merge svn changes up to r27441

Conflicts:

	cfg-common-opts.h
	command.c
	configure
	input/input.c
	libmpcodecs/dec_video.c
	libmpcodecs/vd.c
	libmpdemux/stheader.h
	libvo/sub.c
	libvo/video_out.c
	libvo/vo_xv.c
	libvo/vosub_vidix.c
	libvo/x11_common.c
	libvo/x11_common.h
	mp_core.h
	mplayer.c
	stream/stream.h

7 files changed, 31 insertions, 31 deletions

diff --git a/libmpcodecs/ad_libvorbis.c b/libmpcodecs/ad_libvorbis.c
index eebcd298fe..6f37e27710 100644
--- a/libmpcodecs/ad_libvorbis.c
+++ b/libmpcodecs/ad_libvorbis.c
@@ -20,7 +20,7 @@ static const ad_info_t info =
 
 LIBAD_EXTERN(libvorbis)
 
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
 #include <tremor/ivorbiscodec.h>
 #else
 #include <vorbis/codec.h>
@@ -34,7 +34,7 @@ typedef struct ov_struct_st {
   vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
   vorbis_block     vb; /* local working space for packet->PCM decode */
   float            rg_scale; /* replaygain scale */
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
   int              rg_scale_int;
 #endif
 } ov_struct_t;
@@ -160,7 +160,7 @@ static int init(sh_audio_t *sh)
     /* replaygain: security */
     if(ov->rg_scale > 15.) 
       ov->rg_scale = 15.;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
     ov->rg_scale_int = (int)(ov->rg_scale*64.f);
 #endif
     mp_msg(MSGT_DECAUDIO,MSGL_V,"OggVorbis: Bitstream is %d channel%s, %dHz, %dbit/s %cBR\n",(int)ov->vi.channels,ov->vi.channels>1?"s":"",(int)ov->vi.rate,(int)ov->vi.bitrate_nominal,
@@ -218,7 +218,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 {
         int len = 0;
         int samples;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
         ogg_int32_t **pcm;
 #else
         float scale;
@@ -250,7 +250,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 
 	    /* convert floats to 16 bit signed ints (host order) and
 	       interleave */
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
            if (ov->rg_scale_int == 64) {
 	    for(i=0;i<ov->vi.channels;i++){
 	      ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
@@ -272,15 +272,15 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 	      }
 	    }
 	   } else
-#endif /* TREMOR */
+#endif /* CONFIG_TREMOR */
 	   {
-#ifndef TREMOR
+#ifndef CONFIG_TREMOR
             scale = 32767.f * ov->rg_scale;
 #endif
 	    for(i=0;i<ov->vi.channels;i++){
 	      ogg_int16_t *convbuffer=(ogg_int16_t *)(&buf[len]);
 	      ogg_int16_t *ptr=convbuffer+i;
-#ifdef TREMOR
+#ifdef CONFIG_TREMOR
 	      ogg_int32_t  *mono=pcm[i];
 	      for(j=0;j<bout;j++){
 		int val=(mono[j]*ov->rg_scale_int)>>(9+6);
@@ -297,7 +297,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen)
 		  val=-32768;
 		  clipflag=1;
 		}
-#endif    /* TREMOR */
+#endif /* CONFIG_TREMOR */
 		*ptr=val;
 		ptr+=ov->vi.channels;
 	      }
diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c
index 4a9bf313e2..cfc5dd26f8 100644
--- a/libmpcodecs/ad_qtaudio.c
+++ b/libmpcodecs/ad_qtaudio.c
@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
 #include <QuickTime/QuickTimeComponents.h>
 #endif
 
@@ -30,7 +30,7 @@ static const ad_info_t info = {
 
 LIBAD_EXTERN(qtaudio)
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 typedef struct OpaqueSoundConverter*    SoundConverter;
 typedef unsigned long                   OSType;
 typedef unsigned long                   UnsignedFixed;
@@ -164,7 +164,7 @@ static int loader_init()
     mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n");
 	return 0;
 }
-#endif /* #ifndef HAVE_QUICKTIME */
+#endif /* #ifndef CONFIG_QUICKTIME */
 
 static SoundConverter			   myConverter = NULL;
 static SoundComponentData		   InputFormatInfo,OutputFormatInfo;
@@ -180,7 +180,7 @@ static int preinit(sh_audio_t *sh){
     unsigned long WantedBufferSize=0; //the size you want your buffers to be
 
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     EnterMovies();
 #else
     if(loader_init()) return 0; // failed to load DLL
@@ -280,7 +280,7 @@ static void uninit(sh_audio_t *sh){
 //    FreeLibrary( qtime_qts );
 //    qtime_qts = NULL;
 //    printf("qt dll loader uninit done\n");
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     ExitMovies();
 #endif
 }
diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c
index 28dc529318..23f19ac405 100644
--- a/libmpcodecs/dec_audio.c
+++ b/libmpcodecs/dec_audio.c
@@ -23,7 +23,7 @@
 #include <malloc.h>
 #endif
 
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
 
@@ -167,7 +167,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm,
 		 sh_audio->codec->drv))
 		break;
 	mpadec = mpcodecs_ad_drivers[i];
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 	if (!mpadec) {
 	    /* try to open shared decoder plugin */
 	    int buf_len;
@@ -297,7 +297,7 @@ void uninit_audio(sh_audio_t *sh_audio)
 	mp_msg(MSGT_DECAUDIO, MSGL_V, MSGTR_UninitAudioStr,
 	       sh_audio->codec->drv);
 	sh_audio->ad_driver->uninit(sh_audio);
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 	if (sh_audio->dec_handle)
 	    dlclose(sh_audio->dec_handle);
 #endif
diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c
index 9d8ce75af4..7a3e826e45 100644
--- a/libmpcodecs/dec_video.c
+++ b/libmpcodecs/dec_video.c
@@ -28,7 +28,7 @@
 
 #include "dec_video.h"
 
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
 #include <dlfcn.h>
 #endif
 
@@ -162,7 +162,7 @@ void uninit_video(sh_video_t *sh_video)
         return;
     mp_msg(MSGT_DECVIDEO, MSGL_V, MSGTR_UninitVideoStr, sh_video->codec->drv);
     sh_video->vd_driver->uninit(sh_video);
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
     if (sh_video->dec_handle)
         dlclose(sh_video->dec_handle);
 #endif
@@ -225,7 +225,7 @@ static int init_video(sh_video_t *sh_video, char *codecname, char *vfm,
                         sh_video->codec->drv))
                 break;
         sh_video->vd_driver = mpcodecs_vd_drivers[i];
-#ifdef DYNAMIC_PLUGINS
+#ifdef CONFIG_DYNAMIC_PLUGINS
         if (!sh_video->vd_driver) {
             /* try to open shared decoder plugin */
             int buf_len;
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index e8c02798ab..1e23d2eced 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -68,10 +68,10 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
 #ifdef CONFIG_XANIM
     &mpcodecs_vd_xanim,
 #endif
-#ifdef HAVE_PNG
+#ifdef CONFIG_PNG
     &mpcodecs_vd_mpng,
 #endif
-#ifdef HAVE_JPEG
+#ifdef CONFIG_JPEG
     &mpcodecs_vd_ijpg,
 #endif
     &mpcodecs_vd_mtga,
@@ -80,7 +80,7 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = {
     &mpcodecs_vd_libmpeg2,
 #endif
     &mpcodecs_vd_mpegpes,
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
     &mpcodecs_vd_zrmjpeg,
 #endif
 #ifdef CONFIG_REALCODECS
diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c
index a79f7db490..33aa7b517a 100644
--- a/libmpcodecs/vd_qtvideo.c
+++ b/libmpcodecs/vd_qtvideo.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
 #include <QuickTime/ImageCodec.h>
 #define dump_ImageDescription(x)
 #endif
@@ -30,7 +30,7 @@ LIBVD_EXTERN(qtvideo)
 
 #include "mpbswap.h"
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 #include "loader/qtx/qtxsdk/components.h"
 
 HMODULE   WINAPI LoadLibraryA(LPCSTR);
@@ -53,7 +53,7 @@ static ImageDescriptionHandle framedescHandle;
 static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts
 static HMODULE handler;
 
-#ifndef HAVE_QUICKTIME
+#ifndef CONFIG_QUICKTIME
 static    Component (*FindNextComponent)(Component prev,ComponentDescription* desc);
 static    OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3);
 static    long (*CountComponents)(ComponentDescription* desc);
@@ -88,7 +88,7 @@ static    OSErr           (*QTNewGWorldFromPtr)(GWorldPtr *gw,
                                void *baseAddr,
                                long rowBytes); 
 static    OSErr           (*NewHandleClear)(Size byteCount);                          
-#endif /* #ifndef HAVE_QUICKTIME */
+#endif /* #ifndef CONFIG_QUICKTIME */
 
 // to set/get/query special features/parameters
 static int control(sh_video_t *sh,int cmd,void* arg,...){
@@ -107,7 +107,7 @@ static int init(sh_video_t *sh){
     ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
 
     codec_initialized = 0;
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     EnterMovies();
 #else
 
@@ -154,7 +154,7 @@ static int init(sh_video_t *sh){
     mp_msg(MSGT_DECVIDEO,MSGL_DBG2,"InitializeQTML returned %li\n",result);
 //    result=EnterMovies();
 //    printf("EnterMovies->%d\n",result);
-#endif /* HAVE_QUICKTIME */
+#endif /* CONFIG_QUICKTIME */
 
 #if 0
     memset(&desc,0,sizeof(desc));
@@ -293,7 +293,7 @@ static int init(sh_video_t *sh){
 
 // uninit driver
 static void uninit(sh_video_t *sh){
-#ifdef HAVE_QUICKTIME
+#ifdef CONFIG_QUICKTIME
     ExitMovies();
 #endif
 }
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index af80a47a66..085e2b641b 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -128,7 +128,7 @@ static const vf_info_t* const filter_list[]={
     &vf_info_lavcdeint,
     &vf_info_screenshot,
 #endif
-#ifdef HAVE_ZR
+#ifdef CONFIG_ZR
     &vf_info_zrmjpeg,
 #endif
     &vf_info_dvbscale,