Support the latest development code from XViD dev-api-3 CVS

branch. Still compatible (at compile time) with the stable XViD code.

Adds :
- GMC, global motion compensation (gmc)
- quarter pixel motion estimation (qpel)
- B frames (max_bframes, bquant_ratio, bquant_offset)
- half-resolution U&V encoding (reduced)
- ?? (me_colour)

Based on a patch by Marco "elcabesa" Belli <elcabesa at inwind dot it>.


Also :
* renamed option "br" to "bitrate".
* renamed option "quality" to "me_quality" and defaults to 4 (fast and
  still not that bad).
* added option "4mv", was previously silently included in quality 4, 5
  and 6.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8463 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 9 insertions, 0 deletions

diff --git a/libmpcodecs/vd_xvid.c b/libmpcodecs/vd_xvid.c
index 35072c76b6..fee3a68cb2 100644
--- a/libmpcodecs/vd_xvid.c
+++ b/libmpcodecs/vd_xvid.c
@@ -12,6 +12,10 @@
 #include <divx4.h>
 #include <xvid.h>
 
+#ifndef PMV_EARLYSTOP16
+  #define XVID_DEV
+#endif
+
 static vd_info_t info = 
 {
 	"xvid decoder",
@@ -165,6 +169,11 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
 
   dec.bitstream = data;
   dec.length = len;
+#ifdef XVID_DEV
+  dec.general |= XVID_DEC_LOWDELAY;
+  dec.general |= XVID_DEC_DEBLOCKY;
+  dec.general |= XVID_DEC_DEBLOCKUV;
+#endif
   switch(p->cs) {
   case XVID_CSP_USER:
     dec.image = &d4_pic;