Mercurial > libavcodec.hg

changeset 6446:42fc209231cb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move run length table constants to rl.h
author aurel
date Tue, 04 Mar 2008 23:58:12 +0000
parents 2b553c57ec51
children fe34160a1d1e
files mpegvideo.h rl.h
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mpegvideo.h	Tue Mar 04 23:10:47 2008 +0000
+++ b/mpegvideo.h	Tue Mar 04 23:58:12 2008 +0000
@@ -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 @@
 #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_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];
--- a/rl.h	Tue Mar 04 23:10:47 2008 +0000
+++ b/rl.h	Tue Mar 04 23:58:12 2008 +0000
@@ -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 {