* commit '9047491f':
  swscale: add nv12/nv21->yuv420 converter

Conflicts:
	libswscale/rgb2rgb.c
	libswscale/rgb2rgb_template.c

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