[MPlayer-cvslog] r32556 - in trunk: Makefile libmenu/menu.c libmpcodecs/vf_expand.c libvo/osd.c libvo/osd.h libvo/osd_template.c libvo/vesa_lvo.c libvo/video_out_internal.h libvo/vosub_vidix.c sub/osd.c sub/osd.h s...

[cigaes]

Author: cigaes
Date: Wed Oct 27 19:53:24 2010
New Revision: 32556

Log:
Move osd.[ch] and osd_template.c from libvo to sub.

Added:
   trunk/sub/osd.c
      - copied unchanged from r32551, trunk/libvo/osd.c
   trunk/sub/osd.h
      - copied unchanged from r32551, trunk/libvo/osd.h
   trunk/sub/osd_template.c
      - copied unchanged from r32551, trunk/libvo/osd_template.c
Deleted:
   trunk/libvo/osd.c
   trunk/libvo/osd.h
   trunk/libvo/osd_template.c
Modified:
   trunk/Makefile
   trunk/libmenu/menu.c
   trunk/libmpcodecs/vf_expand.c
   trunk/libvo/vesa_lvo.c
   trunk/libvo/video_out_internal.h
   trunk/libvo/vosub_vidix.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/Makefile	Wed Oct 27 19:53:24 2010	(r32556)
@@ -504,7 +504,6 @@ SRCS_COMMON = asxparser.c \
               libmpdemux/video.c \
               libmpdemux/yuv4mpeg.c \
               libmpdemux/yuv4mpeg_ratio.c \
-              libvo/osd.c \
               osdep/$(GETCH) \
               osdep/$(TIMER) \
               stream/open.c \
@@ -517,6 +516,7 @@ SRCS_COMMON = asxparser.c \
               stream/url.c \
               sub/eosd.c \
               sub/find_sub.c \
+              sub/osd.c \
               sub/spudec.c \
               sub/sub.c \
               sub/sub_cc.c \

Modified: trunk/libmenu/menu.c
==============================================================================
--- trunk/libmenu/menu.c	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/libmenu/menu.c	Wed Oct 27 19:53:24 2010	(r32556)
@@ -26,7 +26,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "libvo/osd.h"
+#include "sub/osd.h"
 #include "sub/font_load.h"
 #include "sub/sub.h"
 #include "osdep/keycodes.h"

Modified: trunk/libmpcodecs/vf_expand.c
==============================================================================
--- trunk/libmpcodecs/vf_expand.c	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/libmpcodecs/vf_expand.c	Wed Oct 27 19:53:24 2010	(r32556)
@@ -36,7 +36,7 @@
 
 #ifdef OSD_SUPPORT
 #include "sub/sub.h"
-#include "libvo/osd.h"
+#include "sub/osd.h"
 #endif
 
 #include "m_option.h"

Modified: trunk/libvo/vesa_lvo.c
==============================================================================
--- trunk/libvo/vesa_lvo.c	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/libvo/vesa_lvo.c	Wed Oct 27 19:53:24 2010	(r32556)
@@ -38,7 +38,7 @@
 #include "libmpcodecs/img_format.h"
 #include "drivers/mga_vid.h" /* <- should be changed to "linux/'something'.h" */
 #include "fastmemcpy.h"
-#include "osd.h"
+#include "sub/osd.h"
 #include "video_out.h"
 #include "sub/sub.h"
 #include "libmpcodecs/vfcap.h"

Modified: trunk/libvo/video_out_internal.h
==============================================================================
--- trunk/libvo/video_out_internal.h	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/libvo/video_out_internal.h	Wed Oct 27 19:53:24 2010	(r32556)
@@ -55,6 +55,6 @@ static int preinit(const char *);
 	uninit\
 };
 
-#include "osd.h"
+#include "sub/osd.h"
 
 #endif /* MPLAYER_VIDEO_OUT_INTERNAL_H */

Modified: trunk/libvo/vosub_vidix.c
==============================================================================
--- trunk/libvo/vosub_vidix.c	Wed Oct 27 19:52:45 2010	(r32555)
+++ trunk/libvo/vosub_vidix.c	Wed Oct 27 19:53:24 2010	(r32556)
@@ -40,7 +40,7 @@
 
 #include "vidix/vidix.h"
 #include "fastmemcpy.h"
-#include "osd.h"
+#include "sub/osd.h"
 #include "video_out.h"
 #include "sub/sub.h"
 #include "vosub_vidix.h"