Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:02:19 +0000 (18:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 11 Aug 2014 16:02:36 +0000 (18:02 +0200)
commit45a529d805cf09d0d43342c925f38e3b56c3a6e5
treec732795f8f4f25fe3befd17a4a638b4221342e7e
parent97cbad3d2c906ed5bd1c30f289f523ee2c15ab73
parentaa943bd31fada23db5cb9611215656ab9ebe5b94
Merge commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94' into release/2.2

* commit 'aa943bd31fada23db5cb9611215656ab9ebe5b94':
  huffyuvdec: check width size for yuv422p

Conflicts:
libavcodec/huffyuvdec.c

See: 6abb9a901fca27da14d4fffbb01948288b5da3ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/huffyuvdec.c