summaryrefslogtreecommitdiff
AgeCommit messageAuthorFilesLines
2017-05-19PD#143976: update ffmpeg to v3.3Jian Wang6142-214403/+746659
2013-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer145-176/+176
2013-10-27avfilter: add mergeplanes filterPaul B Mahol7-1/+377