]> git.sesse.net Git - ffmpeg/history - libavfilter/vf_mergeplanes.c
Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'
[ffmpeg] / libavfilter / vf_mergeplanes.c
2013-10-28 Michael NiedermayerMerge commit '94603feb1b3ad01a821a1a1cef1570b13f471821'
2013-10-28 Michael NiedermayerMerge commit '79ef4b19bfcab8b984682a53bb8561e5c8324731'
2013-10-28 Michael NiedermayerMerge commit 'ddc589ce98c2bba1e59318b5b0224717325eac46'
2013-10-28 Michael NiedermayerMerge commit '529a9893d769f381b72785c500662be2020da5fe'
2013-10-28 Michael NiedermayerMerge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da'
2013-10-28 Michael NiedermayerMerge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5'
2013-10-27 Paul B Maholavfilter: add mergeplanes filter