diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-04 23:58:12 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-04 23:58:12 +0000 |
| commit | 6d93461504670b5cefc434d409f277e6e29a24da (patch) | |
| tree | aaa6e765d2351602763ac4f5be5935267c1a9643 | |
| parent | 288a44fb7a4fb21f9c1e92fc009ad06797ef78d3 (diff) | |
| download | ffmpeg-6d93461504670b5cefc434d409f277e6e29a24da.tar.gz | |
move run length table constants to rl.h
Originally committed as revision 12319 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.h | 7 | ||||
| -rw-r--r-- | libavcodec/rl.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 35ef0e1df7..2a493e7ad0 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -32,6 +32,7 @@ #include "bitstream.h" #include "ratecontrol.h" #include "parser.h" +#include "rl.h" #define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded @@ -61,10 +62,6 @@ enum OutputFormat { #define ME_MAP_SHIFT 3 #define ME_MAP_MV_BITS 11 -/* run length table */ -#define MAX_RUN 64 -#define MAX_LEVEL 64 - #define I_TYPE FF_I_TYPE ///< Intra #define P_TYPE FF_P_TYPE ///< Predicted #define B_TYPE FF_B_TYPE ///< Bi-dir predicted @@ -775,8 +772,6 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s); int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); -#include "rl.h" - extern const uint8_t ff_mpeg4_y_dc_scale_table[32]; extern const uint8_t ff_mpeg4_c_dc_scale_table[32]; extern const uint8_t ff_aic_dc_scale_table[32]; diff --git a/libavcodec/rl.h b/libavcodec/rl.h index ecea2c8911..03d2e56e4f 100644 --- a/libavcodec/rl.h +++ b/libavcodec/rl.h @@ -29,7 +29,10 @@ #include <stdint.h> #include "bitstream.h" -#include "mpegvideo.h" + +/* run length table */ +#define MAX_RUN 64 +#define MAX_LEVEL 64 /** RLTable. */ typedef struct RLTable { |