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)
* commit '685e6f2e3939f124b41c7801cc541dad8252af3d':
  xxan: properly handle odd heights.

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

Simple merge