[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Tue Jan 21 22:37:02 CET 2014

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 22:19:16 2014 +0100| [977abf9aedec429d9c384058a6e3f39a2969b459] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes

Conflicts:
	libswscale/x86/rgb2rgb_template.c

See: 3033cd7555921242cbdc06d0d8aee9f8925d6a3c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=977abf9aedec429d9c384058a6e3f39a2969b459
---