Define ff_log2_run[] in libavcodec/internal.h.

This avoids defining the array with different sizes in
different source files.
pull/293/head
Carl Eugen Hoyos 11 years ago
parent d68ac92dc2
commit 5968415156
  1. 2
      libavcodec/ffv1.h
  2. 2
      libavcodec/internal.h
  3. 3
      libavcodec/jpegls.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;

@ -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 */

@ -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
*/

Loading…
Cancel
Save