[FFmpeg-devel] [PATCH 1/2] MxPEG decoder

[Michael Niedermayer]

On Fri, Nov 05, 2010 at 12:25:44AM +0300, Anatoly Nenashev wrote:
> On 05.11.2010 00:17, Michael Niedermayer wrote:
>> On Thu, Nov 04, 2010 at 05:42:20PM +0300, Anatoly Nenashev wrote:
>>    
>>> On 04.11.2010 03:16, Michael Niedermayer wrote:
>>>      
>>>> On Tue, Nov 02, 2010 at 01:58:21PM +0300, Anatoly Nenashev wrote:
>>>>
>>>>
>>>>
>>>>        
>>>>> diff --git a/libavcodec/options.c b/libavcodec/options.c
>>>>> index ef7573c..6a8c24d 100644
>>>>> --- a/libavcodec/options.c
>>>>> +++ b/libavcodec/options.c
>>>>> @@ -88,6 +88,7 @@ static const AVOption options[]={
>>>>>    {"sgop", "strictly enforce gop size", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_STRICT_GOP, INT_MIN, INT_MAX, V|E, "flags2"},
>>>>>    {"noout", "skip bitstream encoding", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_NO_OUTPUT, INT_MIN, INT_MAX, V|E, "flags2"},
>>>>>    {"local_header", "place global headers at every keyframe instead of in extradata", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_LOCAL_HEADER, INT_MIN, INT_MAX, V|E, "flags2"},
>>>>> +{"return_incomplete_frames", "allow decoder to return incomplete frames", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_RETURN_INCOMPLETE_FRAMES, INT_MIN, INT_MAX, V|D, "flags2"},
>>>>>    {"sub_id", NULL, OFFSET(sub_id), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
>>>>>    {"me_method", "set motion estimation method", OFFSET(me_method), FF_OPT_TYPE_INT, ME_EPZS, INT_MIN, INT_MAX, V|E, "me_method"},
>>>>>    {"zero", "zero motion estimation (fastest)", 0, FF_OPT_TYPE_CONST, ME_ZERO, INT_MIN, INT_MAX, V|E, "me_method" },
>>>>>
>>>>>          
>>>> that should be a seperate patch
>>>>
>>>>
>>>>        
>>> Additional patch in attachment.
>>>      
>>    
>>>   options.c |    1 +
>>>   1 file changed, 1 insertion(+)
>>> 11857017ff98e7f776951555be414e23765442f4  options.patch
>>> diff --git a/libavcodec/options.c b/libavcodec/options.c
>>> index ef7573c..6a8c24d 100644
>>> --- a/libavcodec/options.c
>>> +++ b/libavcodec/options.c
>>> @@ -88,6 +88,7 @@ static const AVOption options[]={
>>>   {"sgop", "strictly enforce gop size", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_STRICT_GOP, INT_MIN, INT_MAX, V|E, "flags2"},
>>>   {"noout", "skip bitstream encoding", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_NO_OUTPUT, INT_MIN, INT_MAX, V|E, "flags2"},
>>>   {"local_header", "place global headers at every keyframe instead of in extradata", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_LOCAL_HEADER, INT_MIN, INT_MAX, V|E, "flags2"},
>>> +{"return_incomplete_frames", "allow decoder to return incomplete frames", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_RETURN_INCOMPLETE_FRAMES, INT_MIN, INT_MAX, V|D, "flags2"},
>>>   {"sub_id", NULL, OFFSET(sub_id), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX},
>>>   {"me_method", "set motion estimation method", OFFSET(me_method), FF_OPT_TYPE_INT, ME_EPZS, INT_MIN, INT_MAX, V|E, "me_method"},
>>>   {"zero", "zero motion estimation (fastest)", 0, FF_OPT_TYPE_CONST, ME_ZERO, INT_MIN, INT_MAX, V|E, "me_method" },
>>>      
>> that wont compile alone
>>    
>
> Yes. But you ask me to split original patch in two parts. The flag  
> CODEC_FLAG2_RETURN_INCOMPLETE_FRAMES is necessary in files mjpegdec.c  
> and options.c. So I don't see the way how to split them  in separate  
> patches.

the #define and AVOption change can be done before their use
so they can be in a seperate patch

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Freedom in capitalist society always remains about the same as it was in
ancient Greek republics: Freedom for slave owners. -- Vladimir Lenin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20101106/f0992a59/attachment.pgp>