Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:27:24 +0000 (01:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 23:41:17 +0000 (01:41 +0200)
commit1ad36551eca99bab51bfd771488ab0ff3af01323
treee85ae8385011f9578a43d575466ec76998f029a8
parent7d7fb61e0df7791c6dbdc1a5aeda63f6f47bf8a8
parentaa0dd52434768da64f1f3d8ae92bcf980c1adffc
Merge commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc'

* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
  xxan: Disallow odd width

See: 77693c541a541661357a0edd5bbaae69c64b2039
See: 8ad9b48c9b5b749df8fbcd59d61278caadc478ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xxan.c