]> git.sesse.net Git - mlt/commitdiff
Merge branch 'videostab' of https://github.com/gmarco/mlt into videostab
authorDan Dennedy <dan@dennedy.org>
Sat, 31 Dec 2011 19:03:43 +0000 (11:03 -0800)
committerDan Dennedy <dan@dennedy.org>
Sat, 31 Dec 2011 19:03:43 +0000 (11:03 -0800)
Conflicts:
src/modules/videostab/transform_image.c


Trivial merge