diff options
author | Thomas Hellström <totte67@users.sourceforge.net> | 2004-11-13 19:32:51 +0000 |
---|---|---|
committer | Thomas Hellström <totte67@users.sourceforge.net> | 2004-11-13 19:32:51 +0000 |
commit | a213a237d17cd0fb00611fe56380a94e3b675638 (patch) | |
tree | fe2becd5ec1174361acf90e0977c8bd4f5c1690c /src/libmpeg2/decode.c | |
parent | c6a1bafda333d15e7b5559cc085200a3c930a13c (diff) | |
download | xine-lib-a213a237d17cd0fb00611fe56380a94e3b675638.tar.gz xine-lib-a213a237d17cd0fb00611fe56380a94e3b675638.tar.bz2 |
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
Diffstat (limited to 'src/libmpeg2/decode.c')
-rw-r--r-- | src/libmpeg2/decode.c | 8 |
1 files changed, 4 insertions, 4 deletions
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. */ |