diff options
| author | wm4 <wm4@mplayer2.org> | 2012-07-28 17:31:55 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-07-28 20:44:07 +0200 |
| commit | f53dcf163da2d94b7fd2b1257ede8cf91e6ce301 (patch) | |
| tree | 00fb0d0eaf1d8dfc48280f5db2982ca40e7dae1f /libvo | |
| parent | 51e198c2a1e43b74ad35ef358628dcd8791158d9 (diff) | |
| download | mpv-f53dcf163da2d94b7fd2b1257ede8cf91e6ce301.tar.bz2 mpv-f53dcf163da2d94b7fd2b1257ede8cf91e6ce301.tar.xz | |
build: remove bin_to_header.py and use TOOLS/file2string.py instead
TOOLS/file2string.py was recently added upstream, so bin_to_header.py
is not needed anymore. Also fix vo_gl3.c, since file2string.py works
slightly different from my script.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl3.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c index adfe636909..d1b0540761 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -55,8 +55,10 @@ #include "fastmemcpy.h" #include "sub/ass_mp.h" +static const char vo_gl3_shaders[] = // Generated from libvo/vo_gl3_shaders.glsl #include "libvo/vo_gl3_shaders.h" +; // How many parts the OSD may consist of at most. #define MAX_OSD_PARTS 20 @@ -630,7 +632,7 @@ static void compile_shaders(struct gl_priv *p) void *tmp = talloc_new(NULL); - struct bstr src = { (char*)vo_gl3_shaders, sizeof(vo_gl3_shaders) }; + struct bstr src = bstr(vo_gl3_shaders); char *vertex_shader = get_section(tmp, src, "vertex_all"); char *shader_prelude = get_section(tmp, src, "prelude"); char *s_video = get_section(tmp, src, "frag_video"); |