[xine-cvs] CVS: xine-lib/src/libmpeg2 decode.c,1.71,1.71.2.1 slice.c,1.9,1.9.2.1 xine_decoder.c,1.36,1.36.2.1

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-lib/src/libmpeg2
In directory usw-pr-cvs1:/tmp/cvs-serv19411/src/libmpeg2

Modified Files:
      Tag: new_api
	decode.c slice.c xine_decoder.c 
Log Message:
New xine-lib compile.
NOTE: all ao/vo drivers are disabled.


Index: decode.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/decode.c,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -u -r1.71 -r1.71.2.1
--- decode.c	10 Jul 2002 14:07:33 -0000	1.71
+++ decode.c	24 Jul 2002 22:39:23 -0000	1.71.2.1
@@ -31,12 +31,11 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
+#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 @@
 						     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 @@
 						     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);

Index: slice.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/slice.c,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- slice.c	4 Jun 2002 23:07:59 -0000	1.9
+++ slice.c	24 Jul 2002 22:39:23 -0000	1.9.2.1
@@ -25,6 +25,7 @@
 
 #include <inttypes.h>
 
+#include "xine_internal.h"
 #include "video_out.h"
 #include "mpeg2_internal.h"
 #include "attributes.h"

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libmpeg2/xine_decoder.c,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -r1.36 -r1.36.2.1
--- xine_decoder.c	10 Jul 2002 14:07:33 -0000	1.36
+++ xine_decoder.c	24 Jul 2002 22:39:23 -0000	1.36.2.1
@@ -30,11 +30,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "xine_internal.h"
 #include "video_out.h"
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
 #include "buffer.h"
-#include "xine_internal.h"
 
 /*
 #define LOG
@@ -86,9 +86,9 @@
   if (buf->decoder_flags & BUF_FLAG_SPECIAL) {
     if (buf->decoder_info[1] == BUF_SPECIAL_ASPECT) {
       this->mpeg2.force_aspect = buf->decoder_info[2];
-      if (buf->decoder_info[3] == 0x1 && buf->decoder_info[2] == XINE_ASPECT_RATIO_ANAMORPHIC)
+      if (buf->decoder_info[3] == 0x1 && buf->decoder_info[2] == XINE_VO_ASPECT_ANAMORPHIC)
         /* letterboxing is denied, we have to do pan&scan */
-        this->mpeg2.force_aspect = XINE_ASPECT_RATIO_PAN_SCAN;
+        this->mpeg2.force_aspect = XINE_VO_ASPECT_PAN_SCAN;
     }
     pthread_mutex_unlock (&this->lock);
     return;