Mercurial > mplayer.hg

diff libmpcodecs/vd_xvid.c @ 9300:32be26de0d7c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup detection of various divx4 versions/alternatives allows mixing xvid with divx4/5linux libs basic rule: -vfm odivx/divx4 and -ovc divx4 uses divx4/5linux/opendivx if available, otherwise uses xvid (if divx4.h is available and xvid has decore()/encore() functions). based on patch by Kim Minh Kaplan <kmkaplan@selfoffice.com>
author arpi
date Thu, 06 Feb 2003 20:24:14 +0000
parents 3725cbbc9366
children 4563dfa92a5b
line wrap: on
line diff
--- a/libmpcodecs/vd_xvid.c	Thu Feb 06 20:18:59 2003 +0000
+++ b/libmpcodecs/vd_xvid.c	Thu Feb 06 20:24:14 2003 +0000
@@ -9,9 +9,17 @@
 #include "vd_internal.h"
 #include "cfgparser.h"
 
-#include <divx4.h>
 #include <xvid.h>
 
+typedef struct
+{
+	void *y;
+	void *u;
+	void *v;
+	int stride_y;
+	int stride_uv;
+}
+DIVX4_DEC_PICTURE;
 
 #ifdef XVID_API_UNSTABLE
 #warning *******************************************************************
@@ -178,7 +186,7 @@
 // decode a frame
 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
   XVID_DEC_FRAME dec;
-  DEC_PICTURE d4_pic;
+  DIVX4_DEC_PICTURE d4_pic;
 #ifdef XVID_CSP_EXTERN
   XVID_DEC_PICTURE pic;
 #endif