Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
  dca: Move all tables into dcadata.h

Conflicts:
	libavcodec/dcadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dcadata.h
Simple merge

diff --cc libavcodec/dcadec.c
index 28ab7b81c7b83596cc46f793af72dbbcc02b93b6,e7bb19113fbd34e092986bac08a0a744c0aed939..2df6178bb0df4fef8ecd627399822b12af468859
--- 1/libavcodec/dcadec.c
--- 2/libavcodec/dcadec.c
+++ b/libavcodec/dcadec.c
@@@ -298,17 -156,6 +218,8 @@@ static av_always_inline int get_bitallo
             ba->offset;
  }
  
- static const uint16_t dca_vlc_offs[] = {
-         0,   512,   640,   768,  1282,  1794,  2436,  3080,  3770,  4454,  5364,
-      5372,  5380,  5388,  5392,  5396,  5412,  5420,  5428,  5460,  5492,  5508,
-      5572,  5604,  5668,  5796,  5860,  5892,  6412,  6668,  6796,  7308,  7564,
-      7820,  8076,  8620,  9132,  9388,  9910, 10166, 10680, 11196, 11726, 12240,
-     12752, 13298, 13810, 14326, 14840, 15500, 16022, 16540, 17158, 17678, 18264,
-     18796, 19352, 19926, 20468, 21472, 22398, 23014, 23622,
- };
- 
 +static float dca_dmix_code(unsigned code);
 +
  static av_cold void dca_init_vlcs(void)
  {
      static int vlcs_initialized = 0;