summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_ass.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:52:17 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 00:52:17 +0200
commit5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch)
tree705780fb6af4cdc0836a10a409fbd51495ec1142 /libmpcodecs/vf_ass.c
parent5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff)
parent160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff)
downloadmpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2
mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vf_ass.c')
-rw-r--r--libmpcodecs/vf_ass.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vf_ass.c b/libmpcodecs/vf_ass.c
index 9076ed099e..427129484d 100644
--- a/libmpcodecs/vf_ass.c
+++ b/libmpcodecs/vf_ass.c
@@ -382,7 +382,7 @@ static const unsigned int fmt_list[]={
0
};
-static int open(vf_instance_t *vf, char* args)
+static int vf_open(vf_instance_t *vf, char *args)
{
int flags;
vf->priv->outfmt = vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
@@ -427,6 +427,6 @@ const vf_info_t vf_info_ass = {
"ass",
"Evgeniy Stepanov",
"",
- open,
+ vf_open,
&vf_opts
};