avcodec/avcodec: Free frame_thread_encoder on avcodec_open2() error

[ffmpeg] / libavcodec / atrac3plus_data.h

diff --git a/libavcodec/atrac3plus_data.h b/libavcodec/atrac3plus_data.h
index 7039936ba3b21c6944238519fa3884b73b70d354..05ae2b78a9ba8736583a5cac078c5d7538afd23d 100644 (file)
--- a/libavcodec/atrac3plus_data.h
+++ b/libavcodec/atrac3plus_data.h
@@ -104,25 +104,6 @@ static const uint8_t atrac3p_sf_xlats[] = {
      0,  1,  2, 14, 15,  3, 13,  4, 12,  5, 11,  6,  7,  9, 10,
 };
 
-static const uint8_t atrac3p_ct_huff1[4][2] = {
-    { 0, 1 }, { 1, 2 }, { 2, 3 }, { 3, 3 },
-};
-
-static const uint8_t atrac3p_ct_huff2[8][2] = {
-    { 0, 2 }, { 1, 3 }, { 2, 3 }, { 3, 3 }, { 4, 3 }, { 5, 3 }, { 6, 4 },
-    { 7, 4 },
-};
-
-static const uint8_t atrac3p_ct_huff3[8][2] = {
-    { 0, 2 }, { 1, 3 }, { 2, 3 }, { 3, 3 }, { 6, 3 }, { 7, 3 }, { 4, 4 },
-    { 5, 4 },
-};
-
-static const uint8_t atrac3p_ct_huff4[8][2] = {
-    { 0, 1 }, { 1, 3 }, { 2, 4 }, { 3, 4 }, { 4, 4 }, { 5, 4 }, { 6, 4 },
-    { 7, 4 },
-};
-
 /* weights for quantized word lengths */
 static const int8_t atrac3p_wl_weights[6][32] = {
     { 5, 5, 4, 4, 3, 3, 2, 2, 1, 1, 0, 0, 0, 0, 0, 0,
@@ -393,7 +374,7 @@ static const uint8_t atrac3p_ct_restricted_to_full[2][7][4] = {
 
 /* If the first entry of a subtable is negative, it means
  * that another VLC is to be reused. */
-static int8_t atrac3p_spectra_cbs[][12] = {
+static const int8_t atrac3p_spectra_cbs[][12] = {
     {  1,  0,  0,  1,  7,  0, 19,  5, 13, 21,  6,  8 },
     {  0,  1,  0,  4, 11,  0,  1, 29,  6, 20,  7,  2 },
     {  0,  0,  1,  8,  0, 13, 18,  7,  2,  0,  0,  0 },