[FFmpeg-cvslog] Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

Michael Niedermayer git at videolan.org
Thu Aug 29 16:00:53 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 29 15:54:14 2013 +0200| [01cac26f6848a809aba3f08e45d8c339702d90a9] | committer: Michael Niedermayer

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:
	libswscale/swscale_unscaled.c

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

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





More information about the ffmpeg-cvslog mailing list