From 403f01979cef7e03b8322ddb870e3959c8de0f77 Mon Sep 17 00:00:00 2001 From: Guenter Bartsch Date: Wed, 4 Sep 2002 23:31:05 +0000 Subject: merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-) CVS patchset: 2606 CVS date: 2002/09/04 23:31:05 --- src/libmpeg2/decode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libmpeg2/decode.c') diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index 39683a5eb..09863e682 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -31,12 +31,11 @@ #include #include +#include "xine_internal.h" #include "video_out.h" #include "mpeg2.h" #include "mpeg2_internal.h" #include "xineutils.h" -#include "xine_internal.h" -#include "events.h" /* #define LOG_PAN_SCAN @@ -373,7 +372,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, picture->coded_picture_width, picture->coded_picture_height, picture->aspect_ratio_information, - IMGFMT_YV12, + XINE_IMGFMT_YV12, picture->picture_structure); else { picture->current_frame = @@ -381,7 +380,7 @@ static inline int parse_chunk (mpeg2dec_t * mpeg2dec, int code, picture->coded_picture_width, picture->coded_picture_height, picture->aspect_ratio_information, - IMGFMT_YV12, + XINE_IMGFMT_YV12, (VO_PREDICTION_FLAG | picture->picture_structure)); if (picture->forward_reference_frame) picture->forward_reference_frame->free (picture->forward_reference_frame); -- cgit v1.2.3