[FFmpeg-devel] [PATCH 03/14] libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]

[Nedeljko Babic]

>> From: Jovan Zelincevic <jovan.zelincevic at imgtec.com>
>> 
>> Move existing code to the new template files
>> 
>> Signed-off-by: Nedeljko Babic <nedeljko.babic at imgtec.com>
>> ---
>>  libavcodec/aacdec.c                    | 3101 +-------------------------------
>>  libavcodec/aacdec_template.c           | 3021 +++++++++++++++++++++++++++++++
>>  libavcodec/cbrt_tablegen.c             |   16 -
>>  libavcodec/cbrt_tablegen_template.c    |   37 +
>>  libavcodec/sinewin_tablegen.c          |   25 -
>>  libavcodec/sinewin_tablegen_template.c |   46 +
>>  6 files changed, 3161 insertions(+), 3085 deletions(-)
>>  create mode 100644 libavcodec/aacdec_template.c
>>  create mode 100644 libavcodec/cbrt_tablegen_template.c
>>  create mode 100644 libavcodec/sinewin_tablegen_template.c
>
>doesnt apply anymore
>
>Applying: libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]
>Using index info to reconstruct a base tree...
>M       libavcodec/aacdec.c
>Falling back to patching base and 3-way merge...
>Auto-merging libavcodec/aacdec.c
>CONFLICT (content): Merge conflict in libavcodec/aacdec.c
>Failed to merge in the changes.

I'll wait for a few days to see if there are some more comments and I'll rebase
and resend the patch set afterwards.

-Nedeljko