RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-20 22:02:59 +00:00
Code Issues Releases Wiki Activity

workaround redefinition of object_type as prev(object_type)+1

Browse Source 
in recent faac cvs (without version number increase)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20086 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nicodvb 2006-10-05 23:12:27 +00:00
parent 3843657c21
commit 31856891fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libmpcodecs/ae_faac.c
View File

@ -19,7 +19,7 @@ static faacEncConfigurationPtr config = NULL;
static int static int
param_bitrate = 128, param_bitrate = 128,
param_quality = 0, param_quality = 0,
param_object_type = MAIN, param_object_type = 1,
param_mpeg = 2, param_mpeg = 2,
param_tns = 0, param_tns = 0,
param_raw = 0, param_raw = 0,
@ -35,7 +35,7 @@ static unsigned long decoder_specific_len = 0;
m_option_t faacopts_conf[] = { m_option_t faacopts_conf[] = {
{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, {"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL},
{"quality", &param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL}, {"quality", &param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 1000, NULL},
{"object", &param_object_type, CONF_TYPE_INT, CONF_RANGE, MAIN, LTP, NULL}, {"object", &param_object_type, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
{"mpeg", &param_mpeg, CONF_TYPE_INT, CONF_RANGE, 2, 4, NULL}, {"mpeg", &param_mpeg, CONF_TYPE_INT, CONF_RANGE, 2, 4, NULL},
{"tns", &param_tns, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"tns", &param_tns, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"cutoff", &param_cutoff, CONF_TYPE_INT, 0, 0, 0, NULL}, {"cutoff", &param_cutoff, CONF_TYPE_INT, 0, 0, 0, NULL},
@ -153,6 +153,7 @@ int mpae_init_faac(audio_encoder_t *encoder)
} }
config->outputFormat = param_raw ? 0 : 1; // 1 is ADTS config->outputFormat = param_raw ? 0 : 1; // 1 is ADTS
config->aacObjectType = param_object_type; config->aacObjectType = param_object_type;
if(MAIN==0) config->aacObjectType--;
config->mpegVersion = (param_mpeg == 4 ? MPEG4 : MPEG2); config->mpegVersion = (param_mpeg == 4 ? MPEG4 : MPEG2);
config->useTns = param_tns; config->useTns = param_tns;
config->allowMidside = 1; config->allowMidside = 1;