# HG changeset patch
# User aurel
# Date 1204675569 0
# Node ID fe34160a1d1e62ae198ed2c953730766be48114a
# Parent  42fc209231cba549658676d2c3af17e1f4c80f7b
move relevant declarations to mpeg12data.h

diff -r 42fc209231cb -r fe34160a1d1e mpeg12data.h
--- a/mpeg12data.h	Tue Mar 04 23:58:12 2008 +0000
+++ b/mpeg12data.h	Wed Mar 05 00:06:09 2008 +0000
@@ -29,7 +29,11 @@
 #define FFMPEG_MPEG12DATA_H
 
 #include <stdint.h>
-#include "mpegvideo.h"
+#include "rational.h"
+#include "rl.h"
+
+extern const uint16_t ff_mpeg1_default_intra_matrix[64];
+extern const uint16_t ff_mpeg1_default_non_intra_matrix[64];
 
 extern const uint16_t ff_mpeg12_vlc_dc_lum_code[12];
 extern const unsigned char ff_mpeg12_vlc_dc_lum_bits[12];
@@ -44,6 +48,8 @@
 
 extern const uint8_t ff_mpeg12_mbMotionVectorTable[17][2];
 
+extern const AVRational ff_frame_rate_tab[];
+
 extern const float ff_mpeg1_aspect[16];
 extern const AVRational ff_mpeg2_aspect[16];
 
diff -r 42fc209231cb -r fe34160a1d1e mpegvideo.h
--- a/mpegvideo.h	Tue Mar 04 23:58:12 2008 +0000
+++ b/mpegvideo.h	Wed Mar 05 00:06:09 2008 +0000
@@ -32,6 +32,7 @@
 #include "bitstream.h"
 #include "ratecontrol.h"
 #include "parser.h"
+#include "mpeg12data.h"
 #include "rl.h"
 
 #define FRAME_SKIPPED 100 ///< return value for header parsers if frame is not coded
@@ -758,10 +759,7 @@
                                int ref_index, int size, int h, int add_rate);
 
 /* mpeg12.c */
-extern const uint16_t ff_mpeg1_default_intra_matrix[64];
-extern const uint16_t ff_mpeg1_default_non_intra_matrix[64];
 extern const uint8_t ff_mpeg1_dc_scale_table[128];
-extern const AVRational ff_frame_rate_tab[];
 
 void mpeg1_encode_picture_header(MpegEncContext *s, int picture_number);
 void mpeg1_encode_mb(MpegEncContext *s,