From 62ccf6c5cccdf1a34a4b85f91615f0f8305b5279 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sun, 26 Aug 2012 19:00:26 +0300 Subject: vo_vdpau: split bitmap packing code into a separate file Split the vo_vdpau code that calculates how to pack all subtitle bitmaps into a larger surface into a separate file. This will allow using it in other VOs. Conflicts: Makefile libvo/vo_vdpau.c Note: this commit does the same as an earlier commit by me (4010dd0b1a27e3996). My commit added the vo_vdpau packer code as eosd_packer.c, while this commit by uau uses bitmap_packer.c. Since bitmap_packer.c has a different interface, and because there are more commits changing OSD rendering coming, I will pick uau's version. However, vo_gl, vo_gl3 and vo_direct3d are still using eosd_packer.c, so to make the transition easier, don't delete eosd_packer.c yet. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4c4027787e..04806786e4 100644 --- a/Makefile +++ b/Makefile @@ -241,6 +241,7 @@ SRCS_COMMON = asxparser.c \ libmpdemux/video.c \ libvo/osd.c \ libvo/eosd_packer.c \ + libvo/bitmap_packer.c \ osdep/numcores.c \ osdep/io.c \ osdep/$(GETCH) \ -- cgit v1.2.3