[FFmpeg-devel] [PATCH] Move H.264 DSP functions from dsputil.c to h264dsp.c

[Panagiotis Issaris]

Michael Niedermayer wrote:
> Hi
>
> On Sat, Jul 28, 2007 at 11:56:57AM +0200, Panagiotis Issaris wrote:
>   
>> Hi,
>>
>> Panagiotis Issaris wrote:
>>     
>>> Hi,
>>>
>>> Michael Niedermayer wrote:
>>>   
>>>       
>>>> Hi
>>>>
>>>> On Fri, Jul 27, 2007 at 06:04:18PM +0200, Panagiotis Issaris wrote:
>>>> [...]
>>>>   
>>>>     
>>>>         
>>>>>>>>  void ff_h264dsp_init(DSPContext* c, AVCodecContext *avctx)
>>>>>>>>  {
>>>>>>>> +#if defined(CONFIG_H264_ENCODER)
>>>>>>>>      c->h264_dct = h264_dct_c;
>>>>>>>> +#endif
>>>>>>>>           
>>>>>>>>             
>>>>>>>>                 
>>>>>>> Here you could use if (ENABLE_H264_ENCODER).
>>>>>>>         
>>>>>>>           
>>>>>>>               
>>>>>> Unfortunately, this won't work, as the H.264 encoder isn't in Subversion
>>>>>> yet.
>>>>>>
>>>>>>
>>>>>>       
>>>>>>         
>>>>>>             
>>>>>>> Except those remarks, the patch looks fine to me.
>>>>>>>         
>>>>>>>           
>>>>>>>               
>>>>>> Thanks!
>>>>>>       
>>>>>>         
>>>>>>             
>>>>> Ouch, I just noticed that with this patch I had accidentally moved lots
>>>>> of the H.264 decoder DSP code in a file with a different header,
>>>>> resulting in incorrect "Copyright by ..." lines.
>>>>>
>>>>> Is it okay to just merge the "Copyright by ..." lines? Or would it be
>>>>> better to split the h264dsp.c file right away in a h264dspenc.c and
>>>>> h264dspdec.c as Aurelien suggested?
>>>>>     
>>>>>       
>>>>>           
>>>> IMHO split if possible
>>>>
>>>> [...]
>>>>   
>>>>     
>>>>         
>>> I'd like to start with renaming h264dsp.c to h264dspenc.c. So that would be:
>>> svn mv h264dsp.c h264dspenc.c and the attached patch. Okay to commit?
>>>
>>>  Makefile  |    2 -
>>>  h264dsp.c |   81
>>> --------------------------------------------------------------
>>>  2 files changed, 1 insertion(+), 82 deletions(-)
>>>
>>>
>>>   
>>>       
>> The previous patch would then be followed by this one, which takes care of
>> some renames after the previous pure rename patch.
>>     
>
> ok
>
> [...]
>   

Applied.

With friendly regards,
Takis