# HG changeset patch
# User arpi
# Date 1015807180 0
# Node ID 0ef48d850bc95754f1d05e0a96ca10c9abdb9f2e
# Parent  021a0b7bd55f5384f7fe1f7e0323594cc9dd0aba
hopefully fixed divx5 header + xvid conflict

diff -r 021a0b7bd55f -r 0ef48d850bc9 libmpcodecs/vd_divx4.c
--- a/libmpcodecs/vd_divx4.c	Mon Mar 11 00:13:26 2002 +0000
+++ b/libmpcodecs/vd_divx4.c	Mon Mar 11 00:39:40 2002 +0000
@@ -132,7 +132,7 @@
     dec_frame.bmp=mpi->planes[0];
     dec_frame.stride=mpi->width;
     
-#ifdef DECORE_DIVX5
+#ifndef DEC_OPT_FRAME_311
     decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
 #else
     decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);
diff -r 021a0b7bd55f -r 0ef48d850bc9 libmpcodecs/vd_odivx.c
--- a/libmpcodecs/vd_odivx.c	Mon Mar 11 00:13:26 2002 +0000
+++ b/libmpcodecs/vd_odivx.c	Mon Mar 11 00:39:40 2002 +0000
@@ -146,7 +146,7 @@
 #ifdef NEW_DECORE
     dec_frame.bmp=&dec_pic;
     dec_pic.y=dec_pic.u=dec_pic.v=NULL;
-#ifdef DECORE_DIVX5
+#ifndef DEC_OPT_FRAME_311
     decore(0x123, DEC_OPT_FRAME, &dec_frame, NULL);
 #else
     decore(0x123, (sh->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL);