From a213a237d17cd0fb00611fe56380a94e3b675638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= Date: Sat, 13 Nov 2004 19:32:51 +0000 Subject: Fixed segfault when seeking with the "xvmc" and "xxmc" plugins playing files with IDCT / mocomp XvMC acceleration. Cleaned up some ugly xvmc / xxmc naming. CVS patchset: 7122 CVS date: 2004/11/13 19:32:51 --- src/libmpeg2/decode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libmpeg2/decode.c') diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 2d8830a84..a6102ea15 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -41,7 +41,7 @@ #include "mpeg2.h" #include "mpeg2_internal.h" #include "xineutils.h" -#include "xxmc.h" +#include "xvmc_vld.h" /* #define LOG_PAN_SCAN @@ -642,7 +642,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, break; case XINE_XVMC_ACCEL_IDCT: case XINE_XVMC_ACCEL_MOCOMP: - mpeg2_xvmc_slice (picture, code, buffer); + mpeg2_xvmc_slice (mpeg2dec, picture, code, buffer); break; default: mpeg2_slice (picture, code, buffer); @@ -656,7 +656,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, break; } case XINE_IMGFMT_XVMC: - mpeg2_xvmc_slice (picture, code, buffer); + mpeg2_xvmc_slice (mpeg2dec, picture, code, buffer); break; default: mpeg2_slice (picture, code, buffer); @@ -764,7 +764,7 @@ void mpeg2_discontinuity (mpeg2dec_t * mpeg2dec) { * Move to libmpeg2_accel.c * int libmpeg2_accel_discontinuity(mpeg2dec_t *); */ - mpeg2dec->xxmc_last_slice_code=-1; + mpeg2dec->xvmc_last_slice_code=-1; /* * End of discontinuity accel code. */ -- cgit v1.2.3