From 18216a2fe0871d528f941ba4e5feeb8f9472523e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Date: Sat, 9 Apr 2005 11:22:14 +0000 Subject: **BUGFIX** Multiple slice-per-rows (HDTV) fixes in the libmpeg2 code, particularly regarding VLD XvMC. Cleaned up hardware acceleration hooks in libmpeg2. Fixed X include path searching while configure detects XvMC support. CVS patchset: 7449 CVS date: 2005/04/09 11:22:14 --- src/libmpeg2/slice_xvmc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libmpeg2/slice_xvmc.c') diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c index f38a74b88..f3ce5fb74 100644 --- a/src/libmpeg2/slice_xvmc.c +++ b/src/libmpeg2/slice_xvmc.c @@ -1728,7 +1728,7 @@ static inline int slice_xvmc_init (picture_t * picture, int code) #undef bit_ptr } -void mpeg2_xvmc_slice (mpeg2dec_t *mpeg2dec, picture_t * picture, int code, uint8_t * buffer) +void mpeg2_xvmc_slice (mpeg2dec_accel_t *accel, picture_t * picture, int code, uint8_t * buffer) { #define bit_buf (picture->bitstream_buf) #define bits (picture->bitstream_bits) @@ -1737,10 +1737,10 @@ void mpeg2_xvmc_slice (mpeg2dec_t *mpeg2dec, picture_t * picture, int code, uint xine_xvmc_t *xvmc = (xine_xvmc_t *) picture->current_frame->accel_data; if (1 == code) { - mpeg2dec->xvmc_last_slice_code = 0; + accel->xvmc_last_slice_code = 0; } - if ((code != mpeg2dec->xvmc_last_slice_code + 1) && - (code != mpeg2dec->xvmc_last_slice_code)) + if ((code != accel->xvmc_last_slice_code + 1) && + (code != accel->xvmc_last_slice_code)) return; bitstream_init (picture, buffer); @@ -1969,7 +1969,7 @@ void mpeg2_xvmc_slice (mpeg2dec_t *mpeg2dec, picture_t * picture, int code, uint default: /* end of slice, or error */ if (mpeg2_cpu_state_restore) mpeg2_cpu_state_restore (&cpu_state); - mpeg2dec->xvmc_last_slice_code = code; + accel->xvmc_last_slice_code = code; return; } } @@ -2068,7 +2068,7 @@ void mpeg2_xvmc_slice (mpeg2dec_t *mpeg2dec, picture_t * picture, int code, uint } } } - mpeg2dec->xvmc_last_slice_code = code; + accel->xvmc_last_slice_code = code; #undef bit_buf #undef bits #undef bit_ptr -- cgit v1.2.3