[FFmpeg-devel] [PATCH 04/10] aacenctab: Add missing ff_ prefixes

[Timothy Gu]

On Sat, Aug 22, 2015 at 04:33:49AM +0100, Rostislav Pehlivanov wrote:
> Applied
> 
> Thanks.

There has been a mistake in the application of this patch that was not
in the patch I sent:

> -const int swb_size_128_len  = FF_ARRAY_ELEMS(swb_size_128);
> -const int swb_size_1024_len = FF_ARRAY_ELEMS(swb_size_1024);
> +const int swb_size_128_len  = FF_ARRAY_ELEMS(ff_aac_swb_size_128);
> +const int swb_size_1024_len = FF_ARRAY_ELEMS(ff_aac_swb_size_1024);

The attached patch rectifies that.

Timothy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-aacenctab-Fix-merge-conflict.patch
Type: text/x-diff
Size: 823 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20150821/708e06d2/attachment.patch>