# HG changeset patch # User atmos4 # Date 1016737147 0 # Node ID b6877402482159c0bfad886fed40fafc1058c4c1 # Parent 4cfa6366e551442c333592f12e60e553c3e7ea59 Im proved Build Version selection for DivX 5. diff -r 4cfa6366e551 -r b68774024821 libmpcodecs/vd_divx4.c --- a/libmpcodecs/vd_divx4.c Thu Mar 21 18:53:32 2002 +0000 +++ b/libmpcodecs/vd_divx4.c Thu Mar 21 18:59:07 2002 +0000 @@ -106,7 +106,17 @@ return 0; } #ifdef DECORE_DIVX5 - dec_param.codec_version = (sh->format==mmioFOURCC('D','I','V','3'))?311:500; + switch(sh->format) { + case mmioFOURCC('D','I','V','3'): + dec_param.codec_version = 311; + break; + case mmioFOURCC('D','I','V','X'): + dec_param.codec_version = 400; + break; + case mmioFOURCC('D','X','5','0'): + default: // Fallback to DivX 5 behaviour + dec_param.codec_version = 500; + } dec_param.build_number = 0; #endif dec_param.x_dim = sh->disp_w; diff -r 4cfa6366e551 -r b68774024821 libmpcodecs/vd_odivx.c --- a/libmpcodecs/vd_odivx.c Thu Mar 21 18:53:32 2002 +0000 +++ b/libmpcodecs/vd_odivx.c Thu Mar 21 18:59:07 2002 +0000 @@ -120,7 +120,17 @@ dec_param.color_depth = 32; #endif #ifdef DECORE_DIVX5 - dec_param.codec_version = (sh->format==mmioFOURCC('D','I','V','3'))?311:500; + switch(sh->format) { + case mmioFOURCC('D','I','V','3'): + dec_param.codec_version = 311; + break; + case mmioFOURCC('D','I','V','X'): + dec_param.codec_version = 400; + break; + case mmioFOURCC('D','X','5','0'): + default: // Fallback to DivX 5 behaviour + dec_param.codec_version = 500; + } dec_param.build_number = 0; #endif dec_param.x_dim = sh->disp_w;