diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:52:17 +0200 |
| commit | 5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652 (patch) | |
| tree | 705780fb6af4cdc0836a10a409fbd51495ec1142 /libmpcodecs/vf_screenshot.c | |
| parent | 5eeba24ab73e4ae64d7212a9ceef3fb8801fe8a8 (diff) | |
| parent | 160b880c4fd10cec41ba2c14c846d0a7e7f21048 (diff) | |
| download | mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.bz2 mpv-5099b1458d6a5e57b4ebd7c6dfc07dbbd405a652.tar.xz | |
Merge svn changes up to r30683
Diffstat (limited to 'libmpcodecs/vf_screenshot.c')
| -rw-r--r-- | libmpcodecs/vf_screenshot.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c index a661ada3ab..7ab25305ef 100644 --- a/libmpcodecs/vf_screenshot.c +++ b/libmpcodecs/vf_screenshot.c @@ -282,8 +282,7 @@ static void uninit(vf_instance_t *vf) free(vf->priv); } -// open conflicts with stdio.h at least under MinGW -static int screenshot_open(vf_instance_t *vf, char* args) +static int vf_open(vf_instance_t *vf, char *args) { vf->config=config; vf->control=control; @@ -315,7 +314,7 @@ const vf_info_t vf_info_screenshot = { "screenshot", "A'rpi, Jindrich Makovicka", "", - screenshot_open, + vf_open, NULL }; |