summaryrefslogtreecommitdiff
path: root/libavfilter/vf_mergeplanes.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-29
* avfilter: add mergeplanes filterPaul B Mahol2013-10-27