diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 14:23:49 +0300 |
| commit | 70e0372a51ec0d040e996d56101b731a4b72d11d (patch) | |
| tree | 91b2f65db46d8846696ba83a3d61d526ab9380b5 /libvo | |
| parent | e14d43f764c5043e5907852e09d61db912ee49f2 (diff) | |
| parent | c051bef87c5a7337b2aca3d4b77fc392a8392780 (diff) | |
| download | mpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.bz2 mpv-70e0372a51ec0d040e996d56101b731a4b72d11d.tar.xz | |
Merge svn changes up to r26510
r26469 and r26470 (which revert files to inferior versions "because
it's policy") are ignored.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/Makefile | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/libvo/Makefile b/libvo/Makefile deleted file mode 100644 index 7dd486a0f3..0000000000 --- a/libvo/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -include ../config.mak - -LIBNAME_COMMON = libosd.a -LIBNAME_MPLAYER = libvo.a - -SRCS_MPLAYER = aspect.c \ - geometry.c \ - old_vo_wrapper.c \ - spuenc.c \ - video_out.c \ - vo_mpegpes.c \ - vo_null.c \ - vo_yuv4mpeg.c \ - $(VO_SRCS) \ - -SRCS_MPLAYER-$(VIDIX) += vosub_vidix.c - -SRCS_COMMON = aclib.c \ - osd.c \ - sub.c \ - -SRCS_COMMON-$(BITMAP_FONT) += font_load.c -SRCS_COMMON-$(FREETYPE) += font_load_ft.c - -include ../mpcommon.mak - -%.o: %.m - $(CC) $(CFLAGS) -c -o $@ $< |