[MPlayer-cvslog] r20086 - trunk/libmpcodecs/ae_faac.c

[nicodvb]

Author: nicodvb
Date: Fri Oct  6 01:12:27 2006
New Revision: 20086

Modified:
   trunk/libmpcodecs/ae_faac.c

Log:
workaround redefinition of object_type as prev(object_type)+1
in recent faac cvs (without version number increase)


Modified: trunk/libmpcodecs/ae_faac.c
==============================================================================
--- trunk/libmpcodecs/ae_faac.c	(original)
+++ trunk/libmpcodecs/ae_faac.c	Fri Oct  6 01:12:27 2006
@@ -19,7 +19,7 @@
 static int 
 	param_bitrate = 128,
 	param_quality = 0,
-	param_object_type = MAIN,
+	param_object_type = 1,
 	param_mpeg = 2,
 	param_tns = 0,
 	param_raw = 0,
@@ -35,7 +35,7 @@
 m_option_t faacopts_conf[] = {
 	{"br", &param_bitrate, CONF_TYPE_INT, 0, 0, 0, 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},
 	{"tns", &param_tns, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"cutoff", &param_cutoff, CONF_TYPE_INT, 0, 0, 0, NULL},
@@ -153,6 +153,7 @@
 	}
 	config->outputFormat = param_raw ? 0 : 1; // 1 is ADTS
 	config->aacObjectType = param_object_type;
+	if(MAIN==0) config->aacObjectType--;
 	config->mpegVersion = (param_mpeg == 4 ? MPEG4 : MPEG2);
 	config->useTns = param_tns;
 	config->allowMidside = 1;