[Avifile]xvid adaptions for avifile 0.7.22

[Michael Deindl]

Hi!

Given the release of xvidcore 0.90 I did a few adjustments to avifile
0.7.22.
It actually needs a bit of cleaning up, but I thought you might be
interested anyways.

Here's the diff:
===================================================================

diff -c avifile0.7-0.7.22/plugins/libxvid/fillplugins.h 
avifile0.7-0.7.22-olmur/plugins/libxvid/fillplugins.h
*** avifile0.7-0.7.22/plugins/libxvid/fillplugins.h     Sat Nov  2 11:46:45 2002--- 
avifile0.7-0.7.22-olmur/plugins/libxvid/fillplugins.h       Sun Dec  8 21:20:51 2002
***************
*** 32,40 ****
  XVIDCSTR(me_zero);
  XVIDCSTR(me_logarithmic);
  XVIDCSTR(me_fullsearch);
  XVIDCSTR(me_pmvfast);
  XVIDCSTR(me_epzs);
- #endif

  XVIDCSTR(postprocessing);
  XVIDCSTR(maxauto);
--- 32,41 ----
  XVIDCSTR(me_zero);
  XVIDCSTR(me_logarithmic);
  XVIDCSTR(me_fullsearch);
+ #endif
+
  XVIDCSTR(me_pmvfast);
  XVIDCSTR(me_epzs);

  XVIDCSTR(postprocessing);
  XVIDCSTR(maxauto);
***************
*** 104,116 ****
      vs.push_back(AttributeInfo(xvidstr_me_fullsearch,
                               "Motion estimation FULLSEARCH",
                               AttributeInfo::Integer, 0, 1));
      vs.push_back(AttributeInfo(xvidstr_me_pmvfast,
                               "Motion estimation PMVFAST",
                               AttributeInfo::Integer, 0, 1));
      vs.push_back(AttributeInfo(xvidstr_me_epzs,
                               "Motion estimation EPZS",
                               AttributeInfo::Integer, 0, 1));
- #endif // undefined
  #else
      vs.push_back(AttributeInfo(xvidstr_rc_period,
                               "Rate control averaging period",
--- 105,117 ----
      vs.push_back(AttributeInfo(xvidstr_me_fullsearch,
                               "Motion estimation FULLSEARCH",
                               AttributeInfo::Integer, 0, 1));
+ #endif // undefined
      vs.push_back(AttributeInfo(xvidstr_me_pmvfast,
                               "Motion estimation PMVFAST",
                               AttributeInfo::Integer, 0, 1));
      vs.push_back(AttributeInfo(xvidstr_me_epzs,
                               "Motion estimation EPZS",
                               AttributeInfo::Integer, 0, 1));
  #else
      vs.push_back(AttributeInfo(xvidstr_rc_period,
                               "Rate control averaging period",
diff -c avifile0.7-0.7.22/plugins/libxvid/xvid.cpp 
avifile0.7-0.7.22-olmur/plugins/libxvid/xvid.cpp
*** avifile0.7-0.7.22/plugins/libxvid/xvid.cpp  Sat Nov  2 11:34:01 2002
--- avifile0.7-0.7.22-olmur/plugins/libxvid/xvid.cpp    Sun Dec  8 21:29:49 
2002***************
*** 387,393 ****
            PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8
            | PMV_HALFPELREFINE8,
            PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16
!           | PMV_EARLYSTOP8 | PMV_HALFPELREFINE8
  #ifdef XVID_INTERLACING
            | PMV_USESQUARES16
  #endif
--- 387,393 ----
            PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EARLYSTOP8
            | PMV_HALFPELREFINE8,
            PMV_EARLYSTOP16 | PMV_HALFPELREFINE16 | PMV_EXTSEARCH16
!           | PMV_EARLYSTOP8 | PMV_HALFPELREFINE8 | PMV_EXTSEARCH8
  #ifdef XVID_INTERLACING
            | PMV_USESQUARES16
  #endif
***************
*** 405,417 ****

        PluginGetAttrInt(m_Info, xvidstr_me_fullsearch, &t);
          if (t) motion |= XVID_ME_FULLSEARCH;

        PluginGetAttrInt(m_Info, xvidstr_me_pmvfast, &t);
          if (t) motion |= XVID_ME_PMVFAST;

        PluginGetAttrInt(m_Info, xvidstr_me_epzs, &t);
        if (t) motion |= XVID_ME_EPZS;
- #endif // undef
  #else
        PluginGetAttrInt(m_Info, xvidstr_rc_period, &param.rc_period);
        PluginGetAttrInt(m_Info, xvidstr_rc_reaction_period, 
&param.rc_reaction_period);
--- 405,417 ----

        PluginGetAttrInt(m_Info, xvidstr_me_fullsearch, &t);
          if (t) motion |= XVID_ME_FULLSEARCH;
+ #endif // undef

        PluginGetAttrInt(m_Info, xvidstr_me_pmvfast, &t);
          if (t) motion |= XVID_ME_PMVFAST;

        PluginGetAttrInt(m_Info, xvidstr_me_epzs, &t);
        if (t) motion |= XVID_ME_EPZS;
  #else
        PluginGetAttrInt(m_Info, xvidstr_rc_period, &param.rc_period);
        PluginGetAttrInt(m_Info, xvidstr_rc_reaction_period, 
&param.rc_reaction_period);

===================================================================

Bye,
Michael
-- 
PGP Key on Servers -- Finger-Print: 51ECA5D2 13938F91 CBF76CC4 F8B5B67C

you know you've been coding too long when you start looking at life as
an analogy to your programs
                -- Frank Sweetser in gnu.misc.discuss

_______________________________________________
Avifile mailing list
[EMAIL PROTECTED]
http://prak.org/mailman/listinfo/avifile