diff options
| author | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-18 21:40:17 +0000 |
|---|---|---|
| committer | aurel <aurel@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-18 21:40:17 +0000 |
| commit | d1f3dd4bccef5da6b173a4c910eb2a88d5b0db1a (patch) | |
| tree | cfeeda7988b27ba68eb33e7dfeb307c96172a8a8 /libmpcodecs | |
| parent | 6c95f845f529f6c5006dbeb997dbbd76ee9a040d (diff) | |
| download | mpv-d1f3dd4bccef5da6b173a4c910eb2a88d5b0db1a.tar.bz2 mpv-d1f3dd4bccef5da6b173a4c910eb2a88d5b0db1a.tar.xz | |
replace mp3lame version detection by required features detection
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16803 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ae_lame.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libmpcodecs/ae_lame.c b/libmpcodecs/ae_lame.c index 73ab91c69c..d062ff37a7 100644 --- a/libmpcodecs/ae_lame.c +++ b/libmpcodecs/ae_lame.c @@ -32,7 +32,7 @@ static int lame_param_free_format = 0; //disabled static int lame_param_br_min = 0; //not specified static int lame_param_br_max = 0; //not specified -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET int lame_param_fast=0; // unset static char* lame_param_preset=NULL; // unset static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name ); @@ -57,7 +57,7 @@ m_option_t lameopts_conf[]={ {"free", &lame_param_free_format, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"br_min", &lame_param_br_min, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, {"br_max", &lame_param_br_max, CONF_TYPE_INT, CONF_RANGE, 0, 1024, NULL}, -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET {"fast", &lame_param_fast, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"preset", &lame_param_preset, CONF_TYPE_STRING, 0, 0, 0, NULL}, #else @@ -181,7 +181,7 @@ int mpae_init_lame(audio_encoder_t *encoder) } if(lame_param_lowpassfreq>=-1) lame_set_lowpassfreq(lame,lame_param_lowpassfreq); if(lame_param_highpassfreq>=-1) lame_set_highpassfreq(lame,lame_param_highpassfreq); -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET if(lame_param_preset != NULL) { mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_LamePresetEquals,lame_param_preset); if(lame_presets_set(lame,lame_param_fast, (lame_param_vbr==0), lame_param_preset) < 0) @@ -205,7 +205,7 @@ int mpae_init_lame(audio_encoder_t *encoder) return 1; } -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET /* lame_presets_set taken out of presets_set in lame-3.93.1/frontend/parse.c and modified */ static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_name ) @@ -256,7 +256,7 @@ static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_ preset_name = "256"; } -#if HAVE_MP3LAME >= 393 +#ifdef HAVE_MP3LAME_PRESET_MEDIUM if (strcmp(preset_name, "medium") == 0) { if (fast > 0) lame_set_preset(gfp, MEDIUM_FAST); @@ -321,7 +321,7 @@ static int lame_presets_set( lame_t gfp, int fast, int cbr, const char* preset_ } #endif -#if HAVE_MP3LAME >= 392 +#ifdef HAVE_MP3LAME_PRESET /* lame_presets_longinfo_dm taken out of presets_longinfo_dm in lame-3.93.1/frontend/parse.c and modified */ static void lame_presets_longinfo_dm ( FILE* msgfp ) |