[FFmpeg-devel] [PATCH 05/12] libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [1/3]

[Nedeljko Babic]

>On Tue, Jun 30, 2015 at 11:53:07AM +0200, Nedeljko Babic wrote:
>> From: Djordje Pesut <djordje.pesut at imgtec.com>
>> 
>> Move the existing code to a new template file.
>> 
>> Signed-off-by: Nedeljko Babic <nedeljko.babic at imgtec.com>
>> ---
>>  libavcodec/aacsbr.c                        | 1419 +---------------------------
>>  libavcodec/aacsbr.h                        |   45 +
>>  libavcodec/{aacsbr.c => aacsbr_template.c} |  377 --------
>>  libavcodec/sbrdsp.c                        |   75 +-
>>  libavcodec/sbrdsp_template.c               |   95 ++
>>  5 files changed, 142 insertions(+), 1869 deletions(-)
>>  copy libavcodec/{aacsbr.c => aacsbr_template.c} (78%)
>>  create mode 100644 libavcodec/sbrdsp_template.c
>
>seems not to apply cleanly
>
>Applying: libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [1/3]
>Using index info to reconstruct a base tree...
>Falling back to patching base and 3-way merge...
>Auto-merging libavcodec/aacsbr.c
>CONFLICT (content): Merge conflict in libavcodec/aacsbr.c
>Failed to merge in the changes.
>Patch failed at 0001 libavcodec: Implementation of AAC_fixed_decoder (SBR-module) [1/3]
>When you have resolved this problem run "git am --resolved".
>If you would prefer to skip this patch, instead run "git am --skip".
>To restore the original branch and stop patching run "git am --abort".

The reason is in the recent changes to the file libavcodec/aacsbr.c.
I'll rebase this as well as other patches and resend them.

Thanks,
- Nedeljko