Commit 6d934615 authored by Aurelien Jacobs's avatar Aurelien Jacobs
Browse files

move run length table constants to rl.h

Originally committed as revision 12319 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 288a44fb
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include "bitstream.h" #include "bitstream.h"
#include "ratecontrol.h" #include "ratecontrol.h"
#include "parser.h" #include "parser.h"
#include "rl.h"
#define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded #define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded
...@@ -61,10 +62,6 @@ enum OutputFormat { ...@@ -61,10 +62,6 @@ enum OutputFormat {
#define ME_MAP_SHIFT 3 #define ME_MAP_SHIFT 3
#define ME_MAP_MV_BITS 11 #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 I_TYPE FF_I_TYPE ///< Intra
#define P_TYPE FF_P_TYPE ///< Predicted #define P_TYPE FF_P_TYPE ///< Predicted
#define B_TYPE FF_B_TYPE ///< Bi-dir predicted #define B_TYPE FF_B_TYPE ///< Bi-dir predicted
...@@ -775,8 +772,6 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s); ...@@ -775,8 +772,6 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s);
void ff_mpeg1_clean_buffers(MpegEncContext *s); void ff_mpeg1_clean_buffers(MpegEncContext *s);
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size); 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_y_dc_scale_table[32];
extern const uint8_t ff_mpeg4_c_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]; extern const uint8_t ff_aic_dc_scale_table[32];
......
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
#include <stdint.h> #include <stdint.h>
#include "bitstream.h" #include "bitstream.h"
#include "mpegvideo.h"
/* run length table */
#define MAX_RUN 64
#define MAX_LEVEL 64
/** RLTable. */ /** RLTable. */
typedef struct RLTable { typedef struct RLTable {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment