[FFmpeg-cvslog] Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 01:27:24 2013 +0200| [1ad36551eca99bab51bfd771488ab0ff3af01323] | committer: Michael Niedermayer

Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'

* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
  xxan: Disallow odd width

See: 77693c541a541661357a0edd5bbaae69c64b2039
See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad36551eca99bab51bfd771488ab0ff3af01323
---