Merge branch 'screenshot' (early part)
commit8d6fc26bb982c5ecb7dbe4c20d51dec47f82abbf
authorUoti Urpala <uau@mplayer2.org>
Fri, 25 Nov 2011 21:59:23 +0000 (25 23:59 +0200)
committerUoti Urpala <uau@mplayer2.org>
Fri, 25 Nov 2011 21:59:23 +0000 (25 23:59 +0200)
tree60e7fca2028093bf454f0d62bd96b40c3e4ab7a4
parent9fae75b81ce2eb475db7652083b388e704833a72
parent3215ec05fe27b1e07c863aadf4402c5bd6dbec33
Merge branch 'screenshot' (early part)
command.c
libmpcodecs/vf.h
mplayer.c