[FFmpeg-cvslog] Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
Michael Niedermayer
git at videolan.org
Wed Apr 10 14:06:51 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 10 13:52:53 2013 +0200| [2a2a643c90ff091f1fa4a0634bcc4e18639bcee0] | committer: Michael Niedermayer
Merge commit 'e67a87eac814c7805d18c983c43033a8a1bd62af'
* commit 'e67a87eac814c7805d18c983c43033a8a1bd62af':
vf_(no)format: switch to an AVOptions-based system.
af_aformat: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/af_aformat.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2a2a643c90ff091f1fa4a0634bcc4e18639bcee0
---
More information about the ffmpeg-cvslog
mailing list