diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-05 00:06:09 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-03-05 00:06:09 +0000 |
| commit | 3bfe9260fa0b9e46e0d23cc085fa55db1050a0bd (patch) | |
| tree | b9828ced0f11b9431d37d49a861e32298ba7ce6e | |
| parent | 6d93461504670b5cefc434d409f277e6e29a24da (diff) | |
move relevant declarations to mpeg12data.h
Originally committed as revision 12320 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpeg12data.h | 8 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libavcodec/mpeg12data.h b/libavcodec/mpeg12data.h index 190817f648..e23ec83188 100644 --- a/libavcodec/mpeg12data.h +++ b/libavcodec/mpeg12data.h @@ -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_mbPatTable[64][2]; 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 --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 2a493e7ad0..69fee86d98 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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 ff_get_mb_score(MpegEncContext * s, int mx, int my, int src_index, 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, |