[FFmpeg-cvslog] Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

Michael Niedermayer git at videolan.org
Sun Feb 10 14:16:24 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 10 14:07:27 2013 +0100| [f2b89f21cc3dfcfda911e621c3ea62f3175eacbe] | committer: Michael Niedermayer

Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'

* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
  sws: dont enable chrSrcHSubSample for planar RGB

Conflicts:
	libswscale/utils.c

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

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





More information about the ffmpeg-cvslog mailing list