[FFmpeg-cvslog] r11903 - in trunk/libavcodec: avcodec.h libmp3lame.c utils.c

[Benoit Fouet]

Michael Niedermayer wrote:
> On Wed, Feb 13, 2008 at 12:22:27PM +0100, Benoit Fouet wrote:
>   
>> Hi,
>>
>> andoma wrote:
>>     
>>> Modified: trunk/libavcodec/utils.c
>>> ==============================================================================
>>> --- trunk/libavcodec/utils.c	(original)
>>> +++ trunk/libavcodec/utils.c	Mon Feb 11 09:01:07 2008
>>> @@ -686,7 +686,7 @@ static const AVOption options[]={
>>>  {"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
>>>  {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
>>>  {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E},
>>> -{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP, INT_MIN, INT_MAX, V|A|E|D, "flags2"},
>>> +{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR, INT_MIN, INT_MAX, V|A|E|D, "flags2"},
>>>   
>>>       
>> the fact that it is enabled by default breaks regression test
>>
>> is the attached patch ok ?
>>     
>
> no, the default was and is enabled
> ffm.c is a mess, just update the regression tests for ffm
>
>   

ok, done

-- 
Ben
Purple Labs S.A.
www.purplelabs.com