[MPlayer-DOCS] Patch: man page incorrectly lists FAAC "object" values

[Nico Sabbi]

Diego Biurrun wrote:

>On Wed, Oct 04, 2006 at 11:57:52PM +0200, Nico Sabbi wrote:
>  
>
>>Diego Biurrun wrote:
>>
>>    
>>
>>>So what do we do?
>>>      
>>>
>>keep mplayer aligned to cvs, as it is now
>>    
>>
>
>The problem of a version mismatch still exists.  Should we require a
>compatible version of FAAC in configure or something?
>
>Diego
>_______________________________________________
>  
>

this patch will work with both versions:

Index: libmpcodecs/ae_faac.c
===================================================================
--- libmpcodecs/ae_faac.c       (revisione 19838)
+++ libmpcodecs/ae_faac.c       (copia locale)
@@ -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;