diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-13 17:31:45 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-09-13 17:31:45 +0000 |
commit | bbcccf2d197e4c127ed0de311cbcb5c0f82b4c9a (patch) | |
tree | ac15cc30cc25c2edd74b5b8a734c507557fd6e13 /libmpeg2/mpeg2_internal.h | |
parent | 26972b8895117a6857b14928e30d978e30e57aaa (diff) | |
download | mpv-bbcccf2d197e4c127ed0de311cbcb5c0f82b4c9a.tar.bz2 mpv-bbcccf2d197e4c127ed0de311cbcb5c0f82b4c9a.tar.xz |
Update internal libmpeg2 copy to version 0.5.1.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27604 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/mpeg2_internal.h')
-rw-r--r-- | libmpeg2/mpeg2_internal.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libmpeg2/mpeg2_internal.h b/libmpeg2/mpeg2_internal.h index 04a31f6926..ee4fc32062 100644 --- a/libmpeg2/mpeg2_internal.h +++ b/libmpeg2/mpeg2_internal.h @@ -25,6 +25,11 @@ * $Id$ */ +#ifndef LIBMPEG2_MPEG2_INTERNAL_H +#define LIBMPEG2_MPEG2_INTERNAL_H + +#define STATE_INTERNAL_NORETURN ((mpeg2_state_t)-1) + /* macroblock modes */ #define MACROBLOCK_INTRA 1 #define MACROBLOCK_PATTERN 2 @@ -149,6 +154,9 @@ struct mpeg2_decoder_s { int mpeg1; + /* XXX: stuff due to xine shit */ + int8_t q_scale_type; + int quantizer_scales[32]; int quantizer_scale; char* quant_store; @@ -220,7 +228,8 @@ struct mpeg2dec_s { int16_t display_offset_x, display_offset_y; int copy_matrix; - int8_t q_scale_type, scaled[4]; + int8_t scaled[4]; /* XXX: MOVED */ + //int8_t q_scale_type, scaled[4]; uint8_t quantizer_matrix[4][64]; uint8_t new_quantizer_matrix[4][64]; @@ -236,7 +245,7 @@ typedef struct { } cpu_state_t; /* cpu_accel.c */ -uint32_t mpeg2_detect_accel (void); +uint32_t mpeg2_detect_accel (uint32_t accel); /* cpu_state.c */ void mpeg2_cpu_state_init (uint32_t accel); @@ -262,7 +271,9 @@ mpeg2_state_t mpeg2_header_end (mpeg2dec_t * mpeg2dec); void mpeg2_set_fbuf (mpeg2dec_t * mpeg2dec, int b_type); /* idct.c */ -void mpeg2_idct_init (uint32_t accel); +extern void mpeg2_idct_init (uint32_t accel); +extern uint8_t mpeg2_scan_norm[64]; +extern uint8_t mpeg2_scan_alt[64]; /* idct_mmx.c */ void mpeg2_idct_copy_sse2 (int16_t * block, uint8_t * dest, int stride); @@ -315,3 +326,5 @@ extern mpeg2_mc_t mpeg2_mc_alpha; extern mpeg2_mc_t mpeg2_mc_vis; extern mpeg2_mc_t mpeg2_mc_arm; extern mpeg2_mc_t mpeg2_mc_iwmmxt; + +#endif /* LIBMPEG2_MPEG2_INTERNAL_H */ |