Merge commit 'a1804df66a4064aa30554a11e4fd6cdac3ed89c0' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:20:57 +0000 (20:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 9 Aug 2014 18:21:22 +0000 (20:21 +0200)
* commit 'a1804df66a4064aa30554a11e4fd6cdac3ed89c0':
  huffyuvdec: check width size for yuv422p

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

Simple merge