Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.

diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 9d8329f00fcfefa1f79d365d38a7f4bd06cc0b37..ba98845e0bfccf3e8b9dd7c0075b21467c541a26 100644 (file)
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -54,8 +54,6 @@
 #define MAX_QUANT_TABLES 8
 #define MAX_CONTEXT_INPUTS 5
 
-extern const uint8_t ff_log2_run[41];
-
 typedef struct VlcState {
     int16_t drift;
     uint16_t error_sum;

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 8aa0ac101cd40dca76fb2c9957c65a0fc25bd7f6..6d3cdcdaaaf23386eca4d8513bcf67b124ce7a67 100644 (file)
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -245,4 +245,6 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height);
 int ff_side_data_update_matrix_encoding(AVFrame *frame,
                                         enum AVMatrixEncoding matrix_encoding);
 
+extern const uint8_t ff_log2_run[41];
+
 #endif /* AVCODEC_INTERNAL_H */

diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h
index 10ae054a7b35e3a7c5377a87b1c376ff00baec5b..c8997c786185c9654cd53767ada349ee4e2aaa9f 100644 (file)
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@@ -30,6 +30,7 @@
 
 #include "libavutil/common.h"
 #include "avcodec.h"
+#include "internal.h"
 
 typedef struct JpeglsContext {
     AVCodecContext *avctx;
@@ -43,8 +44,6 @@ typedef struct JLSState {
     int run_index[4];
 } JLSState;
 
-extern const uint8_t ff_log2_run[32];
-
 /**
  * Calculate initial JPEG-LS parameters
  */