diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
| commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
| tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /libvo/video_out.c | |
| parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
| parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
| download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz | |
Merge svn changes up to r30748
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index f8d857dfc5..31f7ea3dec 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -177,17 +177,16 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_XV &video_out_xv, #endif +#ifdef CONFIG_GL + &video_out_gl, +#endif #ifdef CONFIG_X11 &video_out_x11, &video_out_xover, #endif #ifdef CONFIG_GL - &video_out_gl, &video_out_gl2, #endif -#ifdef CONFIG_MATRIXVIEW - &video_out_matrixview, -#endif #ifdef CONFIG_DGA &video_out_dga, #endif @@ -204,6 +203,9 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_SVGALIB &video_out_svga, #endif +#ifdef CONFIG_MATRIXVIEW + &video_out_matrixview, +#endif #ifdef CONFIG_AA &video_out_aa, #endif @@ -590,7 +592,7 @@ range_t *str2range(char *s) for (i = 0; *endptr; i++) { if (*s == ',') goto out_err; - if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) { + if (!(r = realloc(r, sizeof(*r) * (i + 2)))) { mp_msg(MSGT_GLOBAL, MSGL_WARN,"can't realloc 'r'\n"); return NULL; } |