diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-06-23 03:58:44 +0300 |
| commit | de560e8167c21a8fd9ea34f5f42f377102d65232 (patch) | |
| tree | d5ef49221ccbb17308b0d14a96e6bd8cfba5916f /libvo/video_out.c | |
| parent | 68e70b3ec34af2e1002d17d0dc81b3408a399ade (diff) | |
| parent | 5eee4632d3e2bcf17a29483467d247c71c202e0d (diff) | |
| download | mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.bz2 mpv-de560e8167c21a8fd9ea34f5f42f377102d65232.tar.xz | |
Merge svn changes up to r27123
Conflicts:
libmenu/menu_filesel.c
libmenu/menu_pt.c
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index f3be8d174d..67a995c662 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -209,7 +209,9 @@ const struct vo_driver *video_out_drivers[] = &video_out_xvmc, #endif &video_out_mpegpes, +#ifdef HAVE_YUV4MPEG &video_out_yuv4mpeg, +#endif #ifdef HAVE_PNG &video_out_png, #endif |