From 4b141479da70665db8d5780c9ca9e430c9dd1f09 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 30 Jul 2008 12:01:30 +0000 Subject: Start unifying names of internal preprocessor directives. Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad.c | 16 ++++++++-------- libmpcodecs/ad_faad.c | 2 +- libmpcodecs/ad_mp3lib.c | 2 +- libmpcodecs/ad_realaud.c | 28 ++++++++++++++-------------- libmpcodecs/ae.c | 4 ++-- libmpcodecs/ae_lavc.c | 6 +++--- libmpcodecs/dec_audio.c | 2 +- libmpcodecs/dec_video.c | 2 +- libmpcodecs/vd.c | 12 ++++++------ libmpcodecs/vd_ffmpeg.c | 2 +- libmpcodecs/vd_realvid.c | 18 +++++++++--------- libmpcodecs/ve.c | 8 ++++---- libmpcodecs/ve_lavc.c | 2 +- libmpcodecs/vf.c | 8 ++++---- libmpcodecs/vf_pp.c | 2 +- libmpcodecs/vf_vo.c | 10 +++++----- 16 files changed, 62 insertions(+), 62 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index e79bf8c25f..e553aa1ac3 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -46,15 +46,15 @@ extern ad_functions_t mpcodecs_ad_libdca; ad_functions_t* mpcodecs_ad_drivers[] = { // &mpcodecs_ad_null, -#ifdef USE_MP3LIB +#ifdef CONFIG_MP3LIB &mpcodecs_ad_mp3lib, #endif -#ifdef USE_LIBA52 +#ifdef CONFIG_LIBA52 &mpcodecs_ad_liba52, &mpcodecs_ad_hwac3, #endif &mpcodecs_ad_hwmpa, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &mpcodecs_ad_ffmpeg, #endif &mpcodecs_ad_pcm, @@ -64,13 +64,13 @@ ad_functions_t* mpcodecs_ad_drivers[] = &mpcodecs_ad_msadpcm, &mpcodecs_ad_dk3adpcm, &mpcodecs_ad_msgsm, -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &mpcodecs_ad_dshow, &mpcodecs_ad_dmo, &mpcodecs_ad_acm, &mpcodecs_ad_twin, #endif -#ifdef USE_QTX_CODECS +#ifdef CONFIG_QTX_CODECS &mpcodecs_ad_qtaudio, #endif #ifdef HAVE_FAAD @@ -82,10 +82,10 @@ ad_functions_t* mpcodecs_ad_drivers[] = #ifdef HAVE_SPEEX &mpcodecs_ad_speex, #endif -#ifdef USE_LIBMAD +#ifdef CONFIG_LIBMAD &mpcodecs_ad_libmad, #endif -#ifdef USE_REALCODECS +#ifdef CONFIG_REALCODECS &mpcodecs_ad_realaud, #endif #ifdef HAVE_LIBDV095 @@ -94,7 +94,7 @@ ad_functions_t* mpcodecs_ad_drivers[] = #ifdef HAVE_MUSEPACK &mpcodecs_ad_libmusepack, #endif -#ifdef USE_LIBDCA +#ifdef CONFIG_LIBDCA &mpcodecs_ad_libdca, #endif NULL diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index 62c7a8965e..4613f30937 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -23,7 +23,7 @@ static ad_info_t info = LIBAD_EXTERN(faad) -#ifndef USE_FAAD_INTERNAL +#ifndef CONFIG_FAAD_INTERNAL #include #else #include "libfaad2/faad.h" diff --git a/libmpcodecs/ad_mp3lib.c b/libmpcodecs/ad_mp3lib.c index 50c2c3e3eb..1afb1eafbe 100644 --- a/libmpcodecs/ad_mp3lib.c +++ b/libmpcodecs/ad_mp3lib.c @@ -39,7 +39,7 @@ static int init(sh_audio_t *sh) // MPEG Audio: dec_audio_sh=sh; // save sh_audio for the callback: // MP3_Init(fakemono,mplayer_accel,&mplayer_audio_read); // TODO!!! -#ifdef USE_FAKE_MONO +#ifdef CONFIG_FAKE_MONO MP3_Init(fakemono); #else MP3_Init(); diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c index e4e94139a5..785811bfcd 100644 --- a/libmpcodecs/ad_realaud.c +++ b/libmpcodecs/ad_realaud.c @@ -47,7 +47,7 @@ static unsigned long (*raOpenCodec2)(void*, void*); static unsigned long (*raSetFlavor)(void*,unsigned long); static void (*raSetDLLAccessPath)(char*); static void (*raSetPwd)(char*,char*); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL static unsigned long WINAPI (*wraCloseCodec)(void*); static unsigned long WINAPI (*wraDecode)(void*, char*,unsigned long,char*,unsigned int*,long); static unsigned long WINAPI (*wraFreeDecoder)(void*); @@ -147,7 +147,7 @@ static int load_syms_linux(char *path) } #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL #ifdef WIN32_LOADER #include "loader/ldt_keeper.h" @@ -214,7 +214,7 @@ static int preinit(sh_audio_t *sh){ #ifdef HAVE_LIBDL if (strstr(sh->codec->dll,".dll") || !load_syms_linux(path)) #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (!load_syms_windows(sh->codec->dll)) #endif { @@ -224,7 +224,7 @@ static int preinit(sh_audio_t *sh){ return 0; } -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if((raSetDLLAccessPath && dll_type == 0) || (wraSetDLLAccessPath && dll_type == 1)){ #else if(raSetDLLAccessPath){ @@ -237,7 +237,7 @@ static int preinit(sh_audio_t *sh){ path[strlen(path)]='/'; } path[strlen(path)+1]=0; -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) { int i; @@ -250,7 +250,7 @@ static int preinit(sh_audio_t *sh){ raSetDLLAccessPath(path); } -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1){ if(wraOpenCodec2) result=wraOpenCodec2(&sh->context,REALCODEC_PATH "\\"); @@ -284,7 +284,7 @@ static int preinit(sh_audio_t *sh){ sh->wf->cbSize, // codec data length (char*)(sh->wf+1) // extras }; -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL wra_init_t winit_data={ sh->wf->nSamplesPerSec, sh->wf->wBitsPerSample, @@ -296,7 +296,7 @@ static int preinit(sh_audio_t *sh){ (char*)(sh->wf+1) // extras }; #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) result=wraInitDecoder(sh->context,&winit_data); else @@ -310,13 +310,13 @@ static int preinit(sh_audio_t *sh){ // printf("initdecoder ok (result: %x)\n", result); } -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if((raSetPwd && dll_type == 0) || (wraSetPwd && dll_type == 1)){ #else if(raSetPwd){ #endif // used by 'SIPR' -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) wraSetPwd(sh->context,"Ardubancel Quazanga"); else @@ -337,7 +337,7 @@ static int preinit(sh_audio_t *sh){ flavor = 2; mp_msg(MSGT_DECAUDIO,MSGL_V,"Got sipr flavor %d from bitrate %d\n",flavor, sh->wf->nAvgBytesPerSec); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) result=wraSetFlavor(sh->context,flavor); else @@ -371,7 +371,7 @@ static int init(sh_audio_t *sh_audio){ static void uninit(sh_audio_t *sh){ // uninit the decoder etc... // again: you don't have to free() a_in_buffer here! it's done by the core. -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) { if (wraFreeDecoder) wraFreeDecoder(sh->context); @@ -383,7 +383,7 @@ static void uninit(sh_audio_t *sh){ if (raCloseCodec) raCloseCodec(sh->context); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) { if (rv_handle) FreeLibrary(rv_handle); @@ -407,7 +407,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen) sh->a_in_buffer_len=sh->wf->nBlockAlign; } -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) result=wraDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign, buf, &len, -1); diff --git a/libmpcodecs/ae.c b/libmpcodecs/ae.c index c8b3dd526a..f671f294dc 100644 --- a/libmpcodecs/ae.c +++ b/libmpcodecs/ae.c @@ -22,7 +22,7 @@ #include "ae_lame.h" #endif -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC #include "ae_lavc.h" #endif @@ -55,7 +55,7 @@ audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params ris = mpae_init_toolame(encoder); break; #endif -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC case ACODEC_LAVC: ris = mpae_init_lavc(encoder); break; diff --git a/libmpcodecs/ae_lavc.c b/libmpcodecs/ae_lavc.c index a42fbe004d..fe18ab786e 100644 --- a/libmpcodecs/ae_lavc.c +++ b/libmpcodecs/ae_lavc.c @@ -25,7 +25,7 @@ extern int lavc_param_atag; extern int lavc_param_audio_global_header; extern int avcodec_initialized; static int compressed_frame_size = 0; -#ifdef USE_LIBAVFORMAT +#ifdef CONFIG_LIBAVFORMAT #include "libavformat/avformat.h" extern const struct AVCodecTag *mp_wav_taglists[]; #endif @@ -133,7 +133,7 @@ static int get_frame_size(audio_encoder_t *encoder) return sz; } -#ifndef USE_LIBAVFORMAT +#ifndef CONFIG_LIBAVFORMAT static uint32_t lavc_find_atag(char *codec) { if(codec == NULL) @@ -184,7 +184,7 @@ int mpae_init_lavc(audio_encoder_t *encoder) } if(lavc_param_atag == 0) { -#ifdef USE_LIBAVFORMAT +#ifdef CONFIG_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/dec_audio.c b/libmpcodecs/dec_audio.c index 252f6a1cb3..28dc529318 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -27,7 +27,7 @@ #include #endif -#ifdef USE_FAKE_MONO +#ifdef CONFIG_FAKE_MONO int fakemono = 0; #endif diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 048f41a2ef..bfb2203dcd 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -416,7 +416,7 @@ int filter_video(sh_video_t *sh_video, void *frame, double pts) int ret = vf->put_image(vf, mpi, pts); if (ret > 0) { vf->control(vf, VFCTRL_DRAW_OSD, NULL); -#ifdef USE_ASS +#ifdef CONFIG_ASS vf->control(vf, VFCTRL_DRAW_EOSD, NULL); #endif } diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 6589009c28..a880989529 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -55,13 +55,13 @@ extern vd_functions_t mpcodecs_vd_qtvideo; vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &mpcodecs_vd_ffmpeg, #endif #ifdef HAVE_OGGTHEORA &mpcodecs_vd_theora, #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &mpcodecs_vd_dshow, &mpcodecs_vd_dmo, &mpcodecs_vd_vfw, @@ -71,7 +71,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = { &mpcodecs_vd_raw, &mpcodecs_vd_hmblck, &mpcodecs_vd_nuv, -#ifdef USE_XANIM +#ifdef CONFIG_XANIM &mpcodecs_vd_xanim, #endif #ifdef HAVE_PNG @@ -82,14 +82,14 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #endif &mpcodecs_vd_mtga, &mpcodecs_vd_sgi, -#ifdef USE_LIBMPEG2 +#ifdef CONFIG_LIBMPEG2 &mpcodecs_vd_libmpeg2, #endif &mpcodecs_vd_mpegpes, #ifdef HAVE_ZR &mpcodecs_vd_zrmjpeg, #endif -#ifdef USE_REALCODECS +#ifdef CONFIG_REALCODECS &mpcodecs_vd_realvid, #endif #ifdef HAVE_XVID4 @@ -98,7 +98,7 @@ vd_functions_t* mpcodecs_vd_drivers[] = { #ifdef HAVE_LIBDV095 &mpcodecs_vd_libdv, #endif -#ifdef USE_QTX_CODECS +#ifdef CONFIG_QTX_CODECS &mpcodecs_vd_qtvideo, #endif /* Please do not add any new decoders here. If you want to implement a new diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 59a1bb8143..43ac33729b 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -50,7 +50,7 @@ typedef struct { AVRational last_sample_aspect_ratio; } vd_ffmpeg_ctx; -//#ifdef USE_LIBPOSTPROC +//#ifdef CONFIG_LIBPOSTPROC //unsigned int lavc_pp=0; //#endif diff --git a/libmpcodecs/vd_realvid.c b/libmpcodecs/vd_realvid.c index e61be6d0b0..a54d11b853 100644 --- a/libmpcodecs/vd_realvid.c +++ b/libmpcodecs/vd_realvid.c @@ -50,7 +50,7 @@ static unsigned long (*rvyuv_custom_message)(cmsg_data_t* ,void*); static unsigned long (*rvyuv_free)(void*); static unsigned long (*rvyuv_init)(void*, void*); // initdata,context static unsigned long (*rvyuv_transform)(char*, char*,transform_in_t*,unsigned int*,void*); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL static unsigned long WINAPI (*wrvyuv_custom_message)(cmsg_data_t* ,void*); static unsigned long WINAPI (*wrvyuv_free)(void*); static unsigned long WINAPI (*wrvyuv_init)(void*, void*); // initdata,context @@ -61,7 +61,7 @@ static void *rv_handle=NULL; static int initialized=0; static uint8_t *buffer = NULL; static int bufsz = 0; -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL static int dll_type = 0; /* 0 = unix dlopen, 1 = win32 dll */ #endif @@ -143,7 +143,7 @@ static int load_syms_linux(char *path) { } #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL #ifdef WIN32_LOADER #include "loader/ldt_keeper.h" @@ -283,7 +283,7 @@ static int init(sh_video_t *sh){ #ifdef HAVE_LIBDL if(strstr(sh->codec->dll,".dll") || !load_syms_linux(path)) #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (!load_syms_windows(sh->codec->dll)) #endif { @@ -297,7 +297,7 @@ static int init(sh_video_t *sh){ // if((sh->format!=0x30335652) && !mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_I420)) return 0; // init codec: sh->context=NULL; -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) result=(*wrvyuv_init)(&init_data, &sh->context); else @@ -324,7 +324,7 @@ static int init(sh_video_t *sh){ if (extrahdr_size-8 > cmsg_cnt) mp_msg(MSGT_DECVIDEO,MSGL_WARN,"realvideo: %u bytes of unknown extradata remaining.\n",extrahdr_size-8-cmsg_cnt); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) (*wrvyuv_custom_message)(&cmsg_data,sh->context); else @@ -337,7 +337,7 @@ static int init(sh_video_t *sh){ // uninit driver static void uninit(sh_video_t *sh){ -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) { if (wrvyuv_free) wrvyuv_free(sh->context); @@ -345,7 +345,7 @@ static void uninit(sh_video_t *sh){ #endif if(rvyuv_free) rvyuv_free(sh->context); -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) { if (rv_handle) FreeLibrary(rv_handle); @@ -397,7 +397,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ if (!buffer) return 0; } -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL if (dll_type == 1) result=(*wrvyuv_transform)(dp_data, buffer, &transform_in, transform_out, sh->context); diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c index 55c72332c2..fe1cb7c7e5 100644 --- a/libmpcodecs/ve.c +++ b/libmpcodecs/ve.c @@ -23,12 +23,12 @@ extern vf_info_t ve_info_x264; * libraries and encoders requiring binary support. */ static vf_info_t* encoder_list[]={ -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &ve_info_lavc, #endif -#ifdef USE_WIN32DLL +#ifdef CONFIG_WIN32DLL &ve_info_vfw, -#ifdef USE_QTX_CODECS_WIN32 +#ifdef CONFIG_QTX_CODECS_WIN32 &ve_info_qtvideo, #endif #endif @@ -39,7 +39,7 @@ static vf_info_t* encoder_list[]={ #ifdef HAVE_XVID4 &ve_info_xvid, #endif -#ifdef USE_LIBLZO +#ifdef CONFIG_LIBLZO &ve_info_nuv, #endif #ifdef HAVE_X264 diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 4cd59c6c8a..9b898fa236 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -162,7 +162,7 @@ static char *lavc_param_avopt = NULL; #include "m_option.h" -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC m_option_t lavcopts_conf[]={ {"acodec", &lavc_param_acodec, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"abitrate", &lavc_param_abitrate, CONF_TYPE_INT, CONF_RANGE, 1, 1000000, NULL}, diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index e197b53ff0..d5ee319cc7 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -108,7 +108,7 @@ static const vf_info_t* const filter_list[]={ #endif &vf_info_crop, &vf_info_expand, -#ifdef USE_LIBPOSTPROC +#ifdef CONFIG_LIBPOSTPROC &vf_info_pp, #endif &vf_info_scale, @@ -123,7 +123,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_mirror, &vf_info_palette, &vf_info_pp7, -#ifdef USE_LIBAVCODEC +#ifdef CONFIG_LIBAVCODEC &vf_info_lavc, &vf_info_lavcdeint, &vf_info_screenshot, @@ -170,7 +170,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_delogo, &vf_info_remove_logo, &vf_info_hue, -#ifdef USE_LIBAVCODEC_A +#ifdef CONFIG_LIBAVCODEC_A &vf_info_spp, &vf_info_uspp, &vf_info_fspp, @@ -185,7 +185,7 @@ static const vf_info_t* const filter_list[]={ &vf_info_divtc, &vf_info_harddup, &vf_info_softskip, -#ifdef USE_ASS +#ifdef CONFIG_ASS &vf_info_ass, #endif &vf_info_yadif, diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index cd0a42ac69..2b4b6931b0 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -17,7 +17,7 @@ #include "vf.h" #include "libpostproc/postprocess.h" -#ifdef USE_LIBPOSTPROC_A +#ifdef CONFIG_LIBPOSTPROC_A #define EMU_OLD #include "libpostproc/postprocess_internal.h" #endif diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c index 131eb7f8ab..7e42c77034 100644 --- a/libmpcodecs/vf_vo.c +++ b/libmpcodecs/vf_vo.c @@ -10,7 +10,7 @@ #include "libvo/video_out.h" -#ifdef USE_ASS +#ifdef CONFIG_ASS #include "libass/ass.h" #include "libass/ass_mp.h" extern ass_track_t* ass_track; @@ -24,7 +24,7 @@ extern float sub_delay; struct vf_priv_s { double pts; const vo_functions_t *vo; -#ifdef USE_ASS +#ifdef CONFIG_ASS ass_renderer_t* ass_priv; int prev_visibility; #endif @@ -65,7 +65,7 @@ static int config(struct vf_instance_s* vf, if(config_video_out(video_out,width,height,d_width,d_height,flags,"MPlayer",outfmt)) return 0; -#ifdef USE_ASS +#ifdef CONFIG_ASS if (vf->priv->ass_priv) ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED)); #endif @@ -111,7 +111,7 @@ static int control(struct vf_instance_s* vf, int request, void* data) if(!vo_config_count) return CONTROL_FALSE; // vo not configured? return (video_out->control(VOCTRL_GET_EQUALIZER, eq->item, &eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; } -#ifdef USE_ASS +#ifdef CONFIG_ASS case VFCTRL_INIT_EOSD: { vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data); @@ -203,7 +203,7 @@ static void draw_slice(struct vf_instance_s* vf, static void uninit(struct vf_instance_s* vf) { if (vf->priv) { -#ifdef USE_ASS +#ifdef CONFIG_ASS if (vf->priv->ass_priv) ass_renderer_done(vf->priv->ass_priv); #endif -- cgit v1.2.3