[FFmpeg-devel] [PATCH]Move ff_log2_run definition into put_bits.h

Carl Eugen Hoyos cehoyos at ag.or.at
Sun Mar 9 19:59:34 CET 2014


Hi!

Attached patch fixes a compilation warning that ff_log2_run is defined with a 
different size in jpegls.h.

Please comment, Carl Eugen
-------------- next part --------------
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/jpegls.h b/libavcodec/jpegls.h
index 10ae054..9a9ecb2 100644
--- a/libavcodec/jpegls.h
+++ b/libavcodec/jpegls.h
@@ -30,6 +30,7 @@
 
 #include "libavutil/common.h"
 #include "avcodec.h"
+#include "put_bits.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
  */
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 8081fb9..e780285 100644
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -237,4 +237,6 @@ static inline void set_put_bits_buffer_size(PutBitContext *s, int size)
     s->buf_end = s->buf + size;
 }
 
+extern const uint8_t ff_log2_run[41];
+
 #endif /* AVCODEC_PUT_BITS_H */


More information about the ffmpeg-devel mailing list