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
>From a281ab012357a5caa3ae2493527bcc57fb0dc2f5 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothyg...@gmail.com>
Date: Fri, 21 Aug 2015 22:05:51 -0700
Subject: [PATCH] aacenctab: Fix merge conflict
---
libavcodec/aacenctab.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aacenctab.c b/libavcodec/aacenctab.c
index b6ee0de..f3d70fb 100644
--- a/libavcodec/aacenctab.c
+++ b/libavcodec/aacenctab.c
@@ -104,5 +104,5 @@ const uint8_t *ff_aac_swb_size_1024[] = {
swb_size_1024_8
};
-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);
+const int ff_aac_swb_size_128_len = FF_ARRAY_ELEMS(ff_aac_swb_size_128);
+const int ff_aac_swb_size_1024_len = FF_ARRAY_ELEMS(ff_aac_swb_size_1024);
--
1.9.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
