diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 15:10:07 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-26 15:10:07 +0000 |
commit | 05c7a055e8979865d03b39a9d02061450d969dd5 (patch) | |
tree | eb1be3b8e6d6153055167cbf483c9f308eb9dd26 | |
parent | 4dd84909d12fd198da0369e9da5b479f3474b5b9 (diff) | |
download | mpv-05c7a055e8979865d03b39a9d02061450d969dd5.tar.bz2 mpv-05c7a055e8979865d03b39a9d02061450d969dd5.tar.xz |
Simplify preprocessor directives: There is a general variable for
static/shared FFmpeg libraries now.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpcodecs/ae_lavc.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
-rw-r--r-- | libmpdemux/muxer.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index b16bcccb68..f757657bb5 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -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 *encoder) } 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 --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 74ab4ae189..4f0a222da3 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -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, diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8775c6882b..96c4f12bb3 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -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 diff --git a/libmpdemux/muxer.c b/libmpdemux/muxer.c index f13c7fdd6f..a5ab94e2d5 100644 --- a/libmpdemux/muxer.c +++ b/libmpdemux/muxer.c @@ -36,7 +36,7 @@ muxer_t *muxer_new_muxer(int type,stream_t *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; |