[FFmpeg-cvslog] Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

Michael Niedermayer git at videolan.org
Sat Nov 23 12:18:40 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 23 12:01:42 2013 +0100| [8733b363ac3b2b6e043c3df3d37e4a0258134f4f] | committer: Michael Niedermayer

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
	libswscale/x86/rgb2rgb.c
	libswscale/x86/swscale.c

See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list