[FFmpeg-cvslog] Merge commit '0983f9117f31521643162cb85380672495a9de1b'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sat Apr  8 14:16:06 2017 +0200| [2d40fbe639855e1c6d086699dfd76f15ce96aa42] | committer: Clément Bœsch

Merge commit '0983f9117f31521643162cb85380672495a9de1b'

* commit '0983f9117f31521643162cb85380672495a9de1b':
  metasound: Drop unused tables

This commit is mostly a noop, see
276a8666d2d990335314752f8f8bdfdaac69e410
e8319f602e94af9b8454ed68d8323908ceaf944d

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d40fbe639855e1c6d086699dfd76f15ce96aa42
---

 libavcodec/metasound_data.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/libavcodec/metasound_data.c b/libavcodec/metasound_data.c
index 6d87117..da2548a 100644
--- a/libavcodec/metasound_data.c
+++ b/libavcodec/metasound_data.c
@@ -14946,11 +14946,6 @@ static const uint16_t bark_tab_s16_128[] = {
     2, 2, 2, 3, 3, 5, 7, 12, 25, 67
 };
 
-/* unused
-static const uint16_t bark_tab_s16_64[] = {
-    1, 1, 2, 2, 3, 6, 11, 38
-}; */
-
 static const uint16_t bark_tab_l16s_1024[] = {
       9,   9,   8,   9,  10,   9,  10,  10,
      10,  12,  11,  13,  13,  14,  16,  17,


======================================================================