RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-19 05:41:16 +00:00
Code Issues Releases Wiki Activity

Simplify preprocessor directives: There is a general variable for

Browse Source 
static/shared FFmpeg libraries now.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23139 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2007-04-26 15:10:07 +00:00
parent 4dd84909d1
commit 05c7a055e8
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libmpcodecs/ae_lavc.c
View File

@ -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);

2
libmpcodecs/vf.c
View File

@ -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,

4
libmpdemux/demuxer.c
View File

@ -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

2
libmpdemux/muxer.c
View File

@ -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;