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)
* commit 'aa0dd52434768da64f1f3d8ae92bcf980c1adffc':
  xxan: Disallow odd width

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

Simple merge