[FFmpeg-cvslog] Define ff_log2_run[] in libavcodec/internal.h.
Carl Eugen Hoyos
git at videolan.org
Tue Mar 11 01:04:19 CET 2014
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Mar 10 13:37:12 2014 +0100| [5968415156007de5e154c6af826ab16b7373892a] | committer: Carl Eugen Hoyos
Define ff_log2_run[] in libavcodec/internal.h.
This avoids defining the array with different sizes in
different source files.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5968415156007de5e154c6af826ab16b7373892a
---
libavcodec/ffv1.h | 2 --
libavcodec/internal.h | 2 ++
libavcodec/jpegls.h | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 9d8329f..ba98845 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 8aa0ac1..6d3cdcd 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 10ae054..c8997c7 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
*/
More information about the ffmpeg-cvslog
mailing list