[FFmpeg-cvslog] Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'

Michael Niedermayer git at videolan.org
Tue May 27 03:01:37 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 27 02:54:58 2014 +0200| [de5ec08825918401b604d13c4c49bf6bef01ceb3] | committer: Michael Niedermayer

Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'

* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
	libavfilter/vf_scale.c

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

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





More information about the ffmpeg-cvslog mailing list