diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-08 02:44:37 +0200 |
| commit | 819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781 (patch) | |
| tree | f6d6d1e944e5b44ac1d26adcecc4379cd9dc4806 /libvo | |
| parent | 3488fcafe6709337b25a742999a03d04d561f419 (diff) | |
| parent | 3f1a03feb15344188a8213854246d42db38314ac (diff) | |
| download | mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.bz2 mpv-819b8f08a2d2223a9a4e9a3c65b05b3a3bfaf781.tar.xz | |
Merge svn changes up to r30236
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/matrixview.c | 5 | ||||
| -rw-r--r-- | libvo/video_out.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libvo/matrixview.c b/libvo/matrixview.c index de1e1ccf18..f2dff111a3 100644 --- a/libvo/matrixview.c +++ b/libvo/matrixview.c @@ -3,8 +3,9 @@ * Mucked with by Tugrul Galatali <tugrul@galatali.com> * * MatrixView is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * MatrixView is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libvo/video_out.c b/libvo/video_out.c index 0fec6153eb..9dbe490037 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -256,7 +256,7 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_YUV4MPEG &video_out_yuv4mpeg, #endif -#ifdef CONFIG_PNG +#ifdef CONFIG_LIBAVCODEC &video_out_png, #endif #ifdef CONFIG_JPEG |