diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-10 13:37:12 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-03-10 13:37:12 +0100 |
| commit | 5968415156007de5e154c6af826ab16b7373892a (patch) | |
| tree | 5197a1577e8a46e7944c9f15fed1cb0a4426cbba | |
| parent | d68ac92dc2ae0e66860d90d18835d27bd7d2aa28 (diff) | |
| download | ffmpeg-5968415156007de5e154c6af826ab16b7373892a.tar.gz | |
Define ff_log2_run[] in libavcodec/internal.h.
This avoids defining the array with different sizes in
different source files.
| -rw-r--r-- | libavcodec/ffv1.h | 2 | ||||
| -rw-r--r-- | libavcodec/internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/jpegls.h | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h index 9d8329f00f..ba98845e0b 100644 --- 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 8aa0ac101c..6d3cdcdaaa 100644 --- 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 10ae054a7b..c8997c7861 100644 --- 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 */ |