[FFmpeg-cvslog] Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'
Michael Niedermayer
git at videolan.org
Thu Apr 11 00:38:12 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 00:32:50 2013 +0200| [a4e0defa75b6f766aa31d80c55688d036b5fd87b] | committer: Michael Niedermayer
Merge commit '0c2466dec719b933d161f5d680a57fde38aa5daa'
* commit '0c2466dec719b933d161f5d680a57fde38aa5daa':
vf_transpose: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4e0defa75b6f766aa31d80c55688d036b5fd87b
---
More information about the ffmpeg-cvslog
mailing list