[FFmpeg-cvslog] Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
Michael Niedermayer
git at videolan.org
Tue May 7 11:32:11 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue May 7 11:23:55 2013 +0200| [fe5b0895966382402e8fb17f63dfe8117c8915ec] | committer: Michael Niedermayer
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
vf_scale: add endianness conversion pixel format in query_formats
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe5b0895966382402e8fb17f63dfe8117c8915ec
---
More information about the ffmpeg-cvslog
mailing list