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

Conflicts:
	libavcodec/huffyuvdec.c

See: 6abb9a90Merged-by: Michael Niedermayer <michaelni@gmx.at>