# HG changeset patch
# User diego
# Date 1177600207 0
# Node ID a257dd426da5a58a5d16b3a70a560a80ba457502
# Parent  f35f14c39023fade94ee596d5ffcef6116022b12
Simplify preprocessor directives: There is a general variable for
static/shared FFmpeg libraries now.

diff -r f35f14c39023 -r a257dd426da5 libmpcodecs/ae_lavc.c
--- a/libmpcodecs/ae_lavc.c	Thu Apr 26 13:26:41 2007 +0000
+++ b/libmpcodecs/ae_lavc.c	Thu Apr 26 15:10:07 2007 +0000
@@ -28,7 +28,7 @@
 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 @@
 	}
 	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);
diff -r f35f14c39023 -r a257dd426da5 libmpcodecs/vf.c
--- a/libmpcodecs/vf.c	Thu Apr 26 13:26:41 2007 +0000
+++ b/libmpcodecs/vf.c	Thu Apr 26 15:10:07 2007 +0000
@@ -107,7 +107,7 @@
 #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,
diff -r f35f14c39023 -r a257dd426da5 libmpdemux/demuxer.c
--- a/libmpdemux/demuxer.c	Thu Apr 26 13:26:41 2007 +0000
+++ b/libmpdemux/demuxer.c	Thu Apr 26 15:10:07 2007 +0000
@@ -75,7 +75,7 @@
   &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 @@
 #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
diff -r f35f14c39023 -r a257dd426da5 libmpdemux/muxer.c
--- a/libmpdemux/muxer.c	Thu Apr 26 13:26:41 2007 +0000
+++ b/libmpdemux/muxer.c	Thu Apr 26 15:10:07 2007 +0000
@@ -36,7 +36,7 @@
         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;