Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:26:24 +0000 (15:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 Feb 2013 14:26:32 +0000 (15:26 +0100)
commit68c0144d028bb65ea93651503b154a056246b03d
treec50a3f457c91490ea489cb652e1c3fd886b0280b
parenta845ac78c9428d6fd0f9f4f61a34ac816e3dedfa
parent685e6f2e3939f124b41c7801cc541dad8252af3d
Merge commit '685e6f2e3939f124b41c7801cc541dad8252af3d'

* commit '685e6f2e3939f124b41c7801cc541dad8252af3d':
  xxan: properly handle odd heights.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xxan.c