summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:47:25 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:47:25 +0200
commit90f5873f1a4b528dc245beb75b834c52ef04b3db (patch)
tree9ede9db5ad14d812f1211510b9e48ea11c915458 /libvo
parent15a604c405cb53054853cdc426e124936d6321d8 (diff)
parent8ba6b4eaf939f34ac34993aa225143b4102f6c02 (diff)
downloadmpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.bz2
mpv-90f5873f1a4b528dc245beb75b834c52ef04b3db.tar.xz
Merge svn changes up to r30675
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_matrixview.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libvo/vo_matrixview.c b/libvo/vo_matrixview.c
index 002494b0bd..7cc142a071 100644
--- a/libvo/vo_matrixview.c
+++ b/libvo/vo_matrixview.c
@@ -322,4 +322,3 @@ static int control(uint32_t request, void *data)
}
return VO_NOTIMPL;
}
-