[MPlayer-G2-dev] CVS: g2/!P g2.osd.diff,1.1.1.1,1.2
Gabucino
syncmail at mplayerhq.hu
Thu Feb 12 11:11:01 CET 2004
CVS change done by Gabucino
Update of /cvsroot/mplayer/g2/!P
In directory mail:/var2/tmp/cvs-serv25421
Modified Files:
g2.osd.diff
Log Message:
updated to current CVS
Index: g2.osd.diff
===================================================================
RCS file: /cvsroot/mplayer/g2/!P/g2.osd.diff,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- g2.osd.diff 31 Jan 2004 20:16:18 -0000 1.1.1.1
+++ g2.osd.diff 12 Feb 2004 10:10:59 -0000 1.2
@@ -1,5 +1,6 @@
---- /home/alban/MP/g2/Makefile Thu Jul 10 22:54:15 2003
-+++ /home/alban/MP/g2.dev/Makefile Sat Jul 19 20:40:02 2003
+diff -Naur g2.van/Makefile g2/Makefile
+--- g2.van/Makefile Sat Jan 31 21:16:18 2004
++++ g2/Makefile Thu Feb 12 11:07:49 2004
@@ -10,7 +10,7 @@
STREAM_DEPS = demux/libmpdemux.a stream/libmpstream.a stream/mpdvdkit2/libmpdvdkit.a
CODECS_DEPS = audio/libmpacodecs.a video/libmpvcodecs.a libavcodec/libavcodec.a libavcodec/libpostproc/libpostproc.a \
@@ -13,13 +14,14 @@
$(CC) $(OBJS) test-codecs.o osdep/cpudetect.o -o test-codecs $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) $(EXTRA_LIB) $(CDPARANOIA_LIB) osdep/libosdep.a $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(THEORA_LIB) $(VORBIS_LIB) $(I18NLIBS) -lm
test-play: $(OBJS) $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) osdep/libosdep.a test-play.o input/libinput.a
-- $(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(EXTRA_LIB) $(CDPARANOIA_LIB) $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) $(THEORA_LIB) $(VORBIS_LIB) $(I18NLIBS) -lm
-+ $(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(EXTRA_LIB) $(CDPARANOIA_LIB) $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) $(THEORA_LIB) $(VORBIS_LIB) $(I18NLIBS) -lm `freetype-config --libs`
+- $(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(EXTRA_LIB) $(CDPARANOIA_LIB) $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) $(THEORA_LIB) $(VORBIS_LIB) $(I18NLIBS) $(WIN32_LIB) -lm
++ $(CC) $(OBJS) test-play.o -o test-play $(CODECS_DEPS) $(STREAM_DEPS) $(PLAYER_DEPS) input/libinput.a osdep/libosdep.a $(EXTRA_LIB) $(CDPARANOIA_LIB) $(SMBCLIENT_LIB) $(AO_LIBS) $(VO_LIBS) $(TERMCAP_LIB) $(LIRC_LIB) $(THEORA_LIB) $(VORBIS_LIB) $(I18NLIBS) $(WIN32_LIB) -lm `freetype-config --libs`
test-input: test-input.o input/libinput.a osdep/libosdep.a mp_msg.o get_path.o
- $(CC) test-input.o -o test-input input/libinput.a osdep/libosdep.a mp_msg.o get_path.o $(EXTRA_LIB) $(TERMCAP_LIB) $(LIRC_LIB) $(I18NLIBS) $(MACOSX_FRAMEWORKS)
---- /dev/null Mon Jul 18 01:46:18 1994
-+++ /home/alban/MP/g2.dev/osd/Makefile Sat Jul 19 20:26:17 2003
+ $(CC) test-input.o -o test-input input/libinput.a osdep/libosdep.a mp_msg.o get_path.o $(EXTRA_LIB) $(TERMCAP_LIB) $(LIRC_LIB) $(I18NLIBS) $(MACOSX_FRAMEWORKS) $(WIN32_LIB)
+diff -Naur g2.van/osd/Makefile g2/osd/Makefile
+--- g2.van/osd/Makefile Thu Jan 1 01:00:00 1970
++++ g2/osd/Makefile Thu Feb 12 11:06:55 2004
@@ -0,0 +1,46 @@
+
+BASE=..
@@ -67,8 +69,9 @@
+include .depend
+endif
+
---- /dev/null Mon Jul 18 01:46:18 1994
-+++ /home/alban/MP/g2.dev/osd/obj_test.c Sun Jul 20 18:13:50 2003
+diff -Naur g2.van/osd/obj_test.c g2/osd/obj_test.c
+--- g2.van/osd/obj_test.c Thu Jan 1 01:00:00 1970
++++ g2/osd/obj_test.c Thu Feb 12 11:06:55 2004
@@ -0,0 +1,192 @@
+
+#include "config.h"
@@ -262,8 +265,9 @@
+ 0,
+ cfg_opts, &cfg_def, sizeof(struct config_data_s)
+};
---- /dev/null Mon Jul 18 01:46:18 1994
-+++ /home/alban/MP/g2.dev/osd/osd.c Sun Jul 20 16:57:10 2003
+diff -Naur g2.van/osd/osd.c g2/osd/osd.c
+--- g2.van/osd/osd.c Thu Jan 1 01:00:00 1970
++++ g2/osd/osd.c Thu Feb 12 11:06:55 2004
@@ -0,0 +1,469 @@
+#include "config.h"
+
@@ -734,8 +738,9 @@
+
+}
+
---- /dev/null Mon Jul 18 01:46:18 1994
-+++ /home/alban/MP/g2.dev/osd/osd.h Sun Jul 20 16:48:41 2003
+diff -Naur g2.van/osd/osd.h g2/osd/osd.h
+--- g2.van/osd/osd.h Thu Jan 1 01:00:00 1970
++++ g2/osd/osd.h Thu Feb 12 11:06:55 2004
@@ -0,0 +1,118 @@
+
+// TEMP:
@@ -855,34 +860,37 @@
+void osd_display_free(osd_display_t* disp);
+
+module_info_t* find_osd_obj(char* name);
---- /home/alban/MP/g2/video/Makefile Mon May 12 01:47:03 2003
-+++ /home/alban/MP/g2.dev/video/Makefile Fri Jul 18 18:13:06 2003
+diff -Naur g2.van/video/Makefile g2/video/Makefile
+--- g2.van/video/Makefile Sat Jan 31 21:16:18 2004
++++ g2/video/Makefile Thu Feb 12 11:08:38 2004
@@ -12,7 +12,7 @@
VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT)
# vf_vo.c
--VFILTER_SRCS=vf.c vf_scale.c vf_vo2.c vf_vd.c vf_pp.c vf_format.c vf_tfields.c # vf_crop.c vf_expand.c # vf_format.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_rectangle.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c
-+VFILTER_SRCS=vf.c vf_scale.c vf_vo2.c vf_vd.c vf_pp.c vf_format.c vf_tfields.c vf_osd.c # vf_crop.c vf_expand.c # vf_format.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_rectangle.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c
+-VFILTER_SRCS=vf.c vf_remcirc.c vf_scale.c vf_vo2.c vf_vd.c vf_pp.c vf_format.c vf_tfields.c vf_madei.c # vf_crop.c vf_expand.c # vf_format.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_rectangle.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c
++VFILTER_SRCS=vf.c vf_remcirc.c vf_scale.c vf_vo2.c vf_vd.c vf_pp.c vf_format.c vf_tfields.c vf_madei.c vf_osd.c # vf_crop.c vf_expand.c # vf_format.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_rectangle.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c vf_down3dright.c vf_field.c vf_denoise3d.c vf_hqdn3d.c vf_detc.c vf_telecine.c vf_tfields.c
ENCODER_SRCS=ve.c # ve_lavc.c # ve_divx4.c ve_vfw.c ve_rawrgb.c ve_libdv.c ve_xvid.c ve_qtvideo.c ve_nuv.c
# NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/fli.c native/minilzo.c native/msvidc.c native/nuppelvideo.c native/qtrle.c native/qtrpza.c native/qtsmc.c native/roqav.c native/xa_gsm.c native/svq1.c
---- /home/alban/MP/g2/video/vf.c Sun Jul 13 23:52:25 2003
-+++ /home/alban/MP/g2.dev/video/vf.c Sat Jul 19 16:07:52 2003
-@@ -60,11 +60,13 @@
- extern vf_info_t vf_info_detc;
- extern vf_info_t vf_info_telecine;
+diff -Naur g2.van/video/vf.c g2/video/vf.c
+--- g2.van/video/vf.c Sat Jan 31 21:16:18 2004
++++ g2/video/vf.c Thu Feb 12 11:09:30 2004
+@@ -62,12 +62,14 @@
extern vf_info_t vf_info_tfields;
+ extern vf_info_t vf_info_madei;
+ extern vf_info_t vf_info_remcirc;
+extern vf_info_t vf_info_osd;
//char** vo_plugin_args=(char**) NULL;
// list of available filters:
static vf_info_t* filter_list[]={
+ &vf_info_remcirc,
+ &vf_info_osd,
&vf_info_scale,
&vf_info_vo2,
&vf_info_vd,
-@@ -128,7 +130,7 @@
+@@ -132,7 +134,7 @@
int y;
if(mpi->flags&MP_IMGFLAG_PLANAR){
y0&=~1;h+=h&1;
@@ -891,8 +899,9 @@
// full width clear:
memset(mpi->planes[0]+mpi->stride[0]*y0,0,mpi->stride[0]*h);
memset(mpi->planes[1]+mpi->stride[1]*(y0>>mpi->chroma_y_shift),128,mpi->stride[1]*(h>>mpi->chroma_y_shift));
---- /dev/null Mon Jul 18 01:46:18 1994
-+++ /home/alban/MP/g2.dev/video/vf_osd.c Sun Jul 20 18:07:01 2003
+diff -Naur g2.van/video/vf_osd.c g2/video/vf_osd.c
+--- g2.van/video/vf_osd.c Thu Jan 1 01:00:00 1970
++++ g2/video/vf_osd.c Thu Feb 12 11:06:55 2004
@@ -0,0 +1,253 @@
+
+#include <stdio.h>
More information about the MPlayer-G2-dev
mailing list