Commit 59684151 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos

Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.
parent d68ac92d
...@@ -54,8 +54,6 @@ ...@@ -54,8 +54,6 @@
#define MAX_QUANT_TABLES 8 #define MAX_QUANT_TABLES 8
#define MAX_CONTEXT_INPUTS 5 #define MAX_CONTEXT_INPUTS 5
extern const uint8_t ff_log2_run[41];
typedef struct VlcState { typedef struct VlcState {
int16_t drift; int16_t drift;
uint16_t error_sum; uint16_t error_sum;
......
...@@ -245,4 +245,6 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height); ...@@ -245,4 +245,6 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height);
int ff_side_data_update_matrix_encoding(AVFrame *frame, int ff_side_data_update_matrix_encoding(AVFrame *frame,
enum AVMatrixEncoding matrix_encoding); enum AVMatrixEncoding matrix_encoding);
extern const uint8_t ff_log2_run[41];
#endif /* AVCODEC_INTERNAL_H */ #endif /* AVCODEC_INTERNAL_H */
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "libavutil/common.h" #include "libavutil/common.h"
#include "avcodec.h" #include "avcodec.h"
#include "internal.h"
typedef struct JpeglsContext { typedef struct JpeglsContext {
AVCodecContext *avctx; AVCodecContext *avctx;
...@@ -43,8 +44,6 @@ typedef struct JLSState { ...@@ -43,8 +44,6 @@ typedef struct JLSState {
int run_index[4]; int run_index[4];
} JLSState; } JLSState;
extern const uint8_t ff_log2_run[32];
/** /**
* Calculate initial JPEG-LS parameters * Calculate initial JPEG-LS parameters
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment