Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 12:50:03 +0000 (13:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Feb 2013 12:50:08 +0000 (13:50 +0100)
* qatar/release/9:
  arm: Fall back to runtime cpu feature detection via /proc/cpuinfo
  doc/platform: Fix 10l typo
  xxan: properly handle odd heights.

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

Simple merge