[MPlayer-cvslog] r23139 - in trunk: libmpcodecs/ae_lavc.c libmpcodecs/vf.c libmpdemux/demuxer.c libmpdemux/muxer.c

[diego]

Author: diego
Date: Thu Apr 26 17:10:07 2007
New Revision: 23139

Log:
Simplify preprocessor directives: There is a general variable for
static/shared FFmpeg libraries now.


Modified:
   trunk/libmpcodecs/ae_lavc.c
   trunk/libmpcodecs/vf.c
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/muxer.c

Modified: trunk/libmpcodecs/ae_lavc.c
==============================================================================
--- trunk/libmpcodecs/ae_lavc.c	(original)
+++ trunk/libmpcodecs/ae_lavc.c	Thu Apr 26 17:10:07 2007
@@ -28,7 +28,7 @@ extern int  lavc_param_atag;
 extern int  lavc_param_audio_global_header;
 extern int  avcodec_inited;
 static int compressed_frame_size = 0;
-#if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
 #ifdef USE_LIBAVFORMAT_SO
 #include <ffmpeg/avformat.h>
 #else
@@ -179,7 +179,7 @@ int mpae_init_lavc(audio_encoder_t *enco
 	}
 	if(lavc_param_atag == 0)
 	{
-#if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
 		lavc_param_atag = av_codec_get_tag(mp_wav_taglists, lavc_acodec->id);
 #else
 		lavc_param_atag = lavc_find_atag(lavc_param_acodec);

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	(original)
+++ trunk/libmpcodecs/vf.c	Thu Apr 26 17:10:07 2007
@@ -107,7 +107,7 @@ static vf_info_t* filter_list[]={
 #endif
     &vf_info_crop,
     &vf_info_expand,
-#if defined(USE_LIBPOSTPROC) || defined(USE_LIBPOSTPROC_SO)
+#ifdef USE_LIBPOSTPROC
     &vf_info_pp,
 #endif
     &vf_info_scale,

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Thu Apr 26 17:10:07 2007
@@ -75,7 +75,7 @@ demuxer_desc_t* demuxer_list[] = {
   &demuxer_desc_tv,
 #endif
   &demuxer_desc_mf,
-#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf_preferred,
 #endif
   &demuxer_desc_avi,
@@ -119,7 +119,7 @@ demuxer_desc_t* demuxer_list[] = {
 #ifdef STREAMING_LIVE555
   &demuxer_desc_rtp,
 #endif
-#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
   &demuxer_desc_lavf,
 #endif
 #ifdef HAVE_LIBDV095

Modified: trunk/libmpdemux/muxer.c
==============================================================================
--- trunk/libmpdemux/muxer.c	(original)
+++ trunk/libmpdemux/muxer.c	Thu Apr 26 17:10:07 2007
@@ -36,7 +36,7 @@ muxer_t *muxer_new_muxer(int type,stream
         if(! muxer_init_muxer_rawaudio(muxer))
 	  goto fail;
         break;
-#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
+#ifdef USE_LIBAVFORMAT
       case MUXER_TYPE_LAVF:
         if(! muxer_init_muxer_lavf(muxer))
 	  goto fail;