[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[544] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[544] mplayerxp
|
From: <nic...@us...> - 2012-12-11 16:33:11
|
Revision: 544
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=544&view=rev
Author: nickols_k
Date: 2012-12-11 16:32:57 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
rename libvo -> libvo2 (TRANSACTION END)
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/libao2/ao_wav.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/vd.cpp
mplayerxp/libmpcodecs/vd_divx4.cpp
mplayerxp/libmpcodecs/vd_internal.h
mplayerxp/libmpcodecs/vd_lavc.cpp
mplayerxp/libmpcodecs/vd_libdv.cpp
mplayerxp/libmpcodecs/vd_libmpeg2.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpcodecs/vd_xvid.cpp
mplayerxp/libmpconf/codec-cfg.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/sub_cc.cpp
mplayerxp/libmpdemux/sub_ty.cpp
mplayerxp/libmpstream2/s_dvdnav.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp
mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/libmpsub/find_sub.cpp
mplayerxp/libmpsub/spudec.h
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libvo2/Makefile
mplayerxp/loader/dshow/mediatype.c
mplayerxp/mplayerxp.cpp
mplayerxp/mplayerxp.h
mplayerxp/postproc/libmenu/menu.cpp
mplayerxp/postproc/libmenu/menu_cmdlist.cpp
mplayerxp/postproc/libmenu/menu_console.cpp
mplayerxp/postproc/libmenu/menu_filesel.cpp
mplayerxp/postproc/libmenu/menu_list.cpp
mplayerxp/postproc/libmenu/menu_param.cpp
mplayerxp/postproc/libmenu/menu_pt.cpp
mplayerxp/postproc/libmenu/menu_txt.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.cpp
mplayerxp/postproc/vf_2xsai.cpp
mplayerxp/postproc/vf_aspect.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_denoise3d.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_down3dright.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_expand.cpp
mplayerxp/postproc/vf_flip.cpp
mplayerxp/postproc/vf_format.cpp
mplayerxp/postproc/vf_framestep.cpp
mplayerxp/postproc/vf_il.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_mirror.cpp
mplayerxp/postproc/vf_noise.cpp
mplayerxp/postproc/vf_ow.cpp
mplayerxp/postproc/vf_palette.cpp
mplayerxp/postproc/vf_panscan.cpp
mplayerxp/postproc/vf_perspective.cpp
mplayerxp/postproc/vf_pp.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_rgb2bgr.cpp
mplayerxp/postproc/vf_rotate.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_smartblur.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_swapuv.cpp
mplayerxp/postproc/vf_test.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_vo.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/xmp_core.cpp
mplayerxp/xmpcore/xmp_core.h
mplayerxp/xmpcore/xmp_vplayer.cpp
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/Makefile 2012-12-11 16:32:57 UTC (rev 544)
@@ -11,7 +11,7 @@
TARGET_EXE = $(PROGNAME)
# these subdirectories required installation due binaries within them
-SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo xmpcore
+SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo2 xmpcore
ifeq ($(ENABLE_WIN32LOADER),yes)
SUBDIRS+=loader
endif
@@ -40,7 +40,7 @@
libao2/libao2.a \
postproc/libpostproc.a \
input2/libinput2.a \
- libvo/libvo.a \
+ libvo2/libvo2.a \
osdep/libosdep.a \
nls/libnls.a \
libmpconf/libmpconf.a \
Modified: mplayerxp/libao2/ao_wav.cpp
===================================================================
--- mplayerxp/libao2/ao_wav.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libao2/ao_wav.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -30,7 +30,7 @@
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "help_mp.h"
#include "ao_msg.h"
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -24,7 +24,7 @@
#include "libmpconf/codec-cfg.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "postproc/vf.h"
#include "vd.h"
@@ -107,7 +107,7 @@
delete opaque;
}
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#define MPDEC_THREAD_COND (VF_FLAGS_THREADS|VF_FLAGS_SLICES)
static unsigned smp_num_cpus=1;
static unsigned use_vf_threads=0;
@@ -448,7 +448,7 @@
}
}
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
MPXP_Rc mpcodecs_config_vf(video_decoder_t *opaque, int w, int h){
decvideo_priv_t* priv=reinterpret_cast<decvideo_priv_t*>(opaque->vd_private);
@@ -475,7 +475,7 @@
MSG_V("VDec: vo config request - %d x %d\n",w,h);
csp_again:
- // check if libvo and codec has common outfmt (no conversion):
+ // check if libvo2 and codec has common outfmt (no conversion):
j=-1;
for(i=0;i<CODECS_MAX_OUTFMT;i++){
int flags;
Modified: mplayerxp/libmpcodecs/vd.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -10,7 +10,7 @@
#include "xmpcore/xmp_core.h"
#include "libmpconf/codec-cfg.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -22,7 +22,7 @@
#include "vd_internal.h"
#include "vd.h"
#include "codecs_ld.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/bswap.h"
static const vd_info_t info = {
Modified: mplayerxp/libmpcodecs/vd_internal.h
===================================================================
--- mplayerxp/libmpcodecs/vd_internal.h 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_internal.h 2012-12-11 16:32:57 UTC (rev 544)
@@ -1,6 +1,6 @@
#include "libmpconf/codec-cfg.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "vd.h"
#include "vd_msg.h"
Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -23,7 +23,7 @@
#include "codecs_ld.h"
#include "postproc/postprocess.h"
#include "postproc/vf.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/bswap.h"
static const vd_info_t info = {
@@ -79,7 +79,7 @@
#include "libavcodec/avcodec.h"
#include "libavformat/riff.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
static int vcodec_inited=0;
Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -8,7 +8,7 @@
#include <unistd.h>
#include <math.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "osdep/bswap.h"
#include <libdv/dv.h>
Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -111,7 +111,7 @@
#include "libmpdemux/parse_es.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#ifdef ATTRIBUTE_ALIGNED_MAX
#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
#else
Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -21,7 +21,7 @@
#include "libmpconf/codec-cfg.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "osdep/timer.h"
#include "osdep/fastmemcpy.h"
#include "vd_internal.h"
Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -16,7 +16,7 @@
#include "vd_internal.h"
#include "codecs_ld.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/bswap.h"
static const vd_info_t info = {
Modified: mplayerxp/libmpconf/codec-cfg.cpp
===================================================================
--- mplayerxp/libmpconf/codec-cfg.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpconf/codec-cfg.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -23,7 +23,7 @@
// for mmioFOURCC:
#include "loader/wine/avifmt.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "codec-cfg.h"
#define MSGT_CLASS MSGT_CODECCFG
#include "mp_msg.h"
Modified: mplayerxp/libmpconf/m_option.cpp
===================================================================
--- mplayerxp/libmpconf/m_option.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpconf/m_option.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -865,7 +865,7 @@
NULL
};
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
/* FIXME: snyc with img_format.h */
static struct {
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -18,7 +18,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "osdep/fastmemcpy.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -35,7 +35,7 @@
#include "osdep/bswap.h"
#include "libmpsub/vobsub.h"
#include "libmpsub/subreader.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "libmpcodecs/codecs_ld.h"
#include "libmpcodecs/libnuppelvideo/minilzo.h"
#include "libao2/afmt.h"
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -24,7 +24,7 @@
#include "osdep/bswap.h"
#include "aviheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "aviprint.h"
#include "mpxpav64.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,7 +25,7 @@
#include "aviprint.h"
#include "libmpcodecs/codecs_ld.h"
#include "libmpcodecs/dec_audio.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "libao2/afmt.h"
#include "demux_msg.h"
@@ -176,7 +176,7 @@
// - subtitles up in demuxer buffer...
#include "libmpsub/subreader.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#define OGG_SUB_MAX_LINE 128
static subtitle ogg_sub;
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -12,7 +12,7 @@
#include "stheader.h"
#include "libmpconf/cfgparser.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "demux_msg.h"
struct rawvideo_conf_t {
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -17,7 +17,7 @@
#include "input2/input.h"
#include "osdep/fastmemcpy.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "libao2/afmt.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/sub_cc.cpp
===================================================================
--- mplayerxp/libmpdemux/sub_cc.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/sub_cc.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,8 +25,8 @@
#include "libmpsub/subreader.h"
-#include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "libvo2/video_out.h"
+#include "libvo2/sub.h"
#define CC_MAX_LINE_LENGTH 64
Modified: mplayerxp/libmpdemux/sub_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/sub_ty.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpdemux/sub_ty.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -20,7 +20,7 @@
#include "help_mp.h"
#include "sub_cc.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "demux_msg.h"
extern int sub_justify;
Modified: mplayerxp/libmpstream2/s_dvdnav.cpp
===================================================================
--- mplayerxp/libmpstream2/s_dvdnav.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpstream2/s_dvdnav.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -13,7 +13,7 @@
#include "stream_internal.h"
#include "help_mp.h"
#include "libmpsub/spudec.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "input2/input.h"
#include "mplayerxp.h"
#include <algorithm>
Modified: mplayerxp/libmpstream2/s_tv.cpp
===================================================================
--- mplayerxp/libmpstream2/s_tv.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpstream2/s_tv.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -33,7 +33,7 @@
#include "libmpdemux/stheader.h"
#include "libao2/afmt.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "osdep/fastmemcpy.h"
#include "libao2/audio_out.h"
Modified: mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -56,7 +56,7 @@
#endif
#endif
-#include "../libvo/img_format.h"
+#include "../libvo2/img_format.h"
#include "tv.h"
#include "stream_msg.h"
Modified: mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_dummy.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpstream2/tvi/tvi_dummy.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -7,7 +7,7 @@
#ifdef USE_TV
#include <stdio.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "tv.h"
#include "tvi_def.h"
Modified: mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -29,8 +29,7 @@
#include "libao2/afmt.h"
#include "libao2/audio_out.h"
-#include "libvo/img_format.h"
-#include "libvo/fastmemcpy.h"
+#include "libvo2/img_format.h"
#include "tv.h"
#include "stream_msg.h"
Modified: mplayerxp/libmpsub/find_sub.cpp
===================================================================
--- mplayerxp/libmpsub/find_sub.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpsub/find_sub.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -8,8 +8,8 @@
#include <stdio.h>
#include <limits.h>
-#include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "libvo2/video_out.h"
+#include "libvo2/sub.h"
#include "subreader.h"
#define MSGT_CLASS MSGT_FINDSUB
#include "mp_msg.h"
Modified: mplayerxp/libmpsub/spudec.h
===================================================================
--- mplayerxp/libmpsub/spudec.h 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpsub/spudec.h 2012-12-11 16:32:57 UTC (rev 544)
@@ -1,8 +1,8 @@
#ifndef _MPLAYER_SPUDEC_H
#define _MPLAYER_SPUDEC_H
-#include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "libvo2/video_out.h"
+#include "libvo2/sub.h"
extern int spu_alignment;
extern int spu_aamode;
Modified: mplayerxp/libmpsub/subreader.cpp
===================================================================
--- mplayerxp/libmpsub/subreader.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libmpsub/subreader.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -15,7 +15,7 @@
#include <string.h>
#include <ctype.h>
#include "subreader.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#ifdef USE_ICONV
#ifdef HAVE_GICONV
Modified: mplayerxp/libvo2/Makefile
===================================================================
--- mplayerxp/libvo2/Makefile 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/libvo2/Makefile 2012-12-11 16:32:57 UTC (rev 544)
@@ -1,6 +1,6 @@
include ../mp_config.mak
-LIBNAME = libvo.a
+LIBNAME = libvo2.a
CXXSRCS=video_out.cpp font_load.cpp img_format.cpp screenshot.cpp sub.cpp
CXXSRCS+=osd_render.cpp aspect.cpp vo_null.cpp
Modified: mplayerxp/loader/dshow/mediatype.c
===================================================================
--- mplayerxp/loader/dshow/mediatype.c 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/loader/dshow/mediatype.c 2012-12-11 16:32:57 UTC (rev 544)
@@ -26,7 +26,7 @@
#include "wine/winerror.h"
#include "com.h"
-#include "../libvo/img_format.h"
+#include "../libvo2/img_format.h"
#ifndef NOAVIFILE_HEADERS
#include "audiodecoder.h"
#include "except.h"
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/mplayerxp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -53,9 +53,9 @@
#include "libmpsub/spudec.h"
#include "libmpsub/vobsub.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "libao2/audio_out.h"
#include "libao2/afmt.h"
Modified: mplayerxp/mplayerxp.h
===================================================================
--- mplayerxp/mplayerxp.h 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/mplayerxp.h 2012-12-11 16:32:57 UTC (rev 544)
@@ -11,7 +11,7 @@
#include "libmpconf/cfgparser.h"
#include "libmpsub/subreader.h"
#include "libao2/audio_out.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
struct audio_decoder_t;
struct video_decoder_t;
Modified: mplayerxp/postproc/libmenu/menu.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -11,15 +11,15 @@
#include <fcntl.h>
#include <unistd.h>
-#include "libvo/osd_render.h"
-#include "libvo/font_load.h"
-#include "libvo/sub.h"
+#include "libvo2/osd_render.h"
+#include "libvo2/font_load.h"
+#include "libvo2/sub.h"
#include "osdep/keycodes.h"
#include "libplaytree/asxparser.h"
#include "nls/nls.h"
-#include "libvo/img_format.h"
-#include "libvo/video_out.h"
+#include "libvo2/img_format.h"
+#include "libvo2/video_out.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/m_option.h"
#include "libmpconf/m_struct.h"
Modified: mplayerxp/postproc/libmenu/menu_cmdlist.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_cmdlist.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_cmdlist.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,7 +9,7 @@
#include <ctype.h>
#include <string.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/m_option.h"
@@ -18,7 +18,7 @@
#include "menu.h"
#include "menu_list.h"
-#include "libvo/font_load.h"
+#include "libvo2/font_load.h"
#include "input2/input.h"
#include "version.h"
Modified: mplayerxp/postproc/libmenu/menu_console.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_console.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_console.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <errno.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/cfgparser.h"
@@ -24,7 +24,7 @@
#include "libmpconf/m_option.h"
#include "menu.h"
-#include "libvo/font_load.h"
+#include "libvo2/font_load.h"
#include "osdep/keycodes.h"
#include "input2/input.h"
#include "osdep/timer.h"
Modified: mplayerxp/postproc/libmenu/menu_filesel.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_filesel.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_filesel.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -19,7 +19,7 @@
#include "libmpconf/m_option.h"
#include "libmpconf/cfgparser.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "menu.h"
Modified: mplayerxp/postproc/libmenu/menu_list.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_list.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_list.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,14 +6,14 @@
#include <ctype.h>
#include <string.h>
-#include "libvo/img_format.h"
-#include "libvo/sub.h"
+#include "libvo2/img_format.h"
+#include "libvo2/sub.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/m_struct.h"
#include "menu.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/keycodes.h"
#include "mplayerxp.h" // mpxp_context().video().output
Modified: mplayerxp/postproc/libmenu/menu_param.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_param.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_param.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -19,7 +19,7 @@
#include "libmpconf/m_property.h"
#include "libplaytree/asxparser.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "menu.h"
Modified: mplayerxp/postproc/libmenu/menu_pt.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -7,7 +7,7 @@
#include "help_mp.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/m_struct.h"
Modified: mplayerxp/postproc/libmenu/menu_txt.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_txt.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/libmenu/menu_txt.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -8,8 +8,8 @@
#include <stdio.h>
#include <string.h>
-#include "libvo/img_format.h"
-#include "libvo/sub.h"
+#include "libvo2/img_format.h"
+#include "libvo2/sub.h"
#include "xmpcore/mp_image.h"
#include "libmpconf/cfgparser.h"
@@ -17,7 +17,7 @@
#include "libmpconf/m_option.h"
#include "menu.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/keycodes.h"
#include "pp_msg.h"
#include "mplayerxp.h" // mpxp_context().video().output
Modified: mplayerxp/postproc/vf.cpp
===================================================================
--- mplayerxp/postproc/vf.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,8 +9,8 @@
#include "mplayerxp.h"
#include "help_mp.h"
-#include "libvo/img_format.h"
-#include "libvo/video_out.h"
+#include "libvo2/img_format.h"
+#include "libvo2/video_out.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
@@ -165,7 +165,7 @@
MSG_DBG2("passthru mode to %s\n",vf->next->info->name);
return vf_get_new_image(vf->next,outfmt,mp_imgtype,mp_imgflag,w,h,xp_idx);
}
- // Note: we should call libvo first to check if it supports direct rendering
+ // Note: we should call libvo2 first to check if it supports direct rendering
// and if not, then fallback to software buffers:
switch(mp_imgtype){
case MP_IMGTYPE_IP:
@@ -201,7 +201,7 @@
if(!mpi->bpp) mp_image_setfmt(mpi,outfmt);
MSG_DBG2("vf_get_new_image setfmt. flags=0x%X\n",mpi->flags);
if(!(mpi->flags&MP_IMGFLAG_ALLOCATED) && mpi->type>MP_IMGTYPE_EXPORT) {
- // check libvo first!
+ // check libvo2 first!
if(vf->get_image) vf->get_image(vf,mpi);
MSG_DBG2("[vf->get_image] returns xp_idx=%u\n",mpi->xp_idx);
Modified: mplayerxp/postproc/vf.h
===================================================================
--- mplayerxp/postproc/vf.h 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf.h 2012-12-11 16:32:57 UTC (rev 544)
@@ -3,7 +3,7 @@
#include <stdint.h>
#include "xmpcore/xmp_enums.h"
#include "xmpcore/mp_image.h"
-#include "libvo/video_out.h" // for vo_flags_e
+#include "libvo2/video_out.h" // for vo_flags_e
#include "vfcap.h"
struct vf_instance_t;
Modified: mplayerxp/postproc/vf_1bpp.cpp
===================================================================
--- mplayerxp/postproc/vf_1bpp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_1bpp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_2xsai.cpp
===================================================================
--- mplayerxp/postproc/vf_2xsai.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_2xsai.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_aspect.cpp
===================================================================
--- mplayerxp/postproc/vf_aspect.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_aspect.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_delogo.cpp
===================================================================
--- mplayerxp/postproc/vf_delogo.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_delogo.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -29,7 +29,7 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_denoise3d.cpp
===================================================================
--- mplayerxp/postproc/vf_denoise3d.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_denoise3d.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include <math.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_dint.cpp
===================================================================
--- mplayerxp/postproc/vf_dint.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_dint.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,7 +9,7 @@
#include "osdep/fastmemcpy.h"
#include "xmpcore/mp_image.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_down3dright.cpp
===================================================================
--- mplayerxp/postproc/vf_down3dright.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_down3dright.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -8,7 +8,7 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_eq.cpp
===================================================================
--- mplayerxp/postproc/vf_eq.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_eq.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -20,8 +20,8 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
-#include "libvo/video_out.h"
+#include "libvo2/img_format.h"
+#include "libvo2/video_out.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_expand.cpp
===================================================================
--- mplayerxp/postproc/vf_expand.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_expand.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
@@ -15,8 +15,8 @@
#include "osdep/fastmemcpy.h"
#ifdef OSD_SUPPORT
-#include "libvo/video_out.h"
-#include "libvo/sub.h"
+#include "libvo2/video_out.h"
+#include "libvo2/sub.h"
#endif
#include "pp_msg.h"
#include "mplayerxp.h" // mpxp_context().video().output
Modified: mplayerxp/postproc/vf_flip.cpp
===================================================================
--- mplayerxp/postproc/vf_flip.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_flip.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -29,7 +29,7 @@
#include "vf.h"
#include "vf_internal.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
//===========================================================================//
Modified: mplayerxp/postproc/vf_format.cpp
===================================================================
--- mplayerxp/postproc/vf_format.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_format.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_framestep.cpp
===================================================================
--- mplayerxp/postproc/vf_framestep.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_framestep.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -57,7 +57,7 @@
#include "help_mp.h"
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_il.cpp
===================================================================
--- mplayerxp/postproc/vf_il.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_il.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include <assert.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_menu.cpp
===================================================================
--- mplayerxp/postproc/vf_menu.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_menu.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -10,14 +10,14 @@
#include "mplayerxp.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
-#include "libvo/video_out.h"
-#include "libvo/font_load.h"
+#include "libvo2/video_out.h"
+#include "libvo2/font_load.h"
#include "input2/input.h"
#include "libmpconf/m_struct.h"
#include "libmenu/menu.h"
Modified: mplayerxp/postproc/vf_mirror.cpp
===================================================================
--- mplayerxp/postproc/vf_mirror.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_mirror.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_noise.cpp
===================================================================
--- mplayerxp/postproc/vf_noise.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_noise.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -27,7 +27,7 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_ow.cpp
===================================================================
--- mplayerxp/postproc/vf_ow.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_ow.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -33,7 +33,7 @@
#include <inttypes.h>
#include <math.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_palette.cpp
===================================================================
--- mplayerxp/postproc/vf_palette.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_palette.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_panscan.cpp
===================================================================
--- mplayerxp/postproc/vf_panscan.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_panscan.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
@@ -17,7 +17,7 @@
#include "osdep/fastmemcpy.h"
#ifdef OSD_SUPPORT
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#endif
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_perspective.cpp
===================================================================
--- mplayerxp/postproc/vf_perspective.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_perspective.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -26,7 +26,7 @@
#include <assert.h>
#include <math.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_pp.cpp
===================================================================
--- mplayerxp/postproc/vf_pp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_pp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,7 +9,7 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_raw.cpp
===================================================================
--- mplayerxp/postproc/vf_raw.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_raw.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -10,7 +10,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_rgb2bgr.cpp
===================================================================
--- mplayerxp/postproc/vf_rgb2bgr.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_rgb2bgr.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_rotate.cpp
===================================================================
--- mplayerxp/postproc/vf_rotate.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_rotate.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_scale.cpp
===================================================================
--- mplayerxp/postproc/vf_scale.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_scale.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -8,12 +8,12 @@
#include "osdep/cpudetect.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "osdep/fastmemcpy.h"
#include "swscale.h"
#include "libavutil/log.h"
Modified: mplayerxp/postproc/vf_smartblur.cpp
===================================================================
--- mplayerxp/postproc/vf_smartblur.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_smartblur.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -29,7 +29,7 @@
#include <locale.h>
#endif
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_softpulldown.cpp
===================================================================
--- mplayerxp/postproc/vf_softpulldown.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_softpulldown.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -5,13 +5,13 @@
#include <stdlib.h>
#include <string.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
-#include "libvo/sub.h"
+#include "libvo2/sub.h"
#include "pp_msg.h"
struct vf_priv_t {
Modified: mplayerxp/postproc/vf_swapuv.cpp
===================================================================
--- mplayerxp/postproc/vf_swapuv.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_swapuv.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,7 +25,7 @@
#include <inttypes.h>
#include <assert.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_test.cpp
===================================================================
--- mplayerxp/postproc/vf_test.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_test.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -25,7 +25,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_unsharp.cpp
===================================================================
--- mplayerxp/postproc/vf_unsharp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_unsharp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -33,7 +33,7 @@
#include <locale.h>
#endif
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_vo.cpp
===================================================================
--- mplayerxp/postproc/vf_vo.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_vo.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,8 +9,8 @@
#include "vf.h"
#include "vf_internal.h"
#include "vfcap.h"
-#include "libvo/video_out.h"
-#include "libvo/dri_vo.h"
+#include "libvo2/video_out.h"
+#include "libvo2/dri_vo.h"
#include "pp_msg.h"
#include "mplayerxp.h" // mpxp_context().video().output
@@ -157,7 +157,7 @@
}
extern const vf_info_t vf_info_vo = {
- "libvo wrapper",
+ "libvo2 wrapper",
"vo",
"A'rpi",
"for internal use",
Modified: mplayerxp/postproc/vf_yuvcsp.cpp
===================================================================
--- mplayerxp/postproc/vf_yuvcsp.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_yuvcsp.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_yuy2.cpp
===================================================================
--- mplayerxp/postproc/vf_yuy2.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_yuy2.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_yvu9.cpp
===================================================================
--- mplayerxp/postproc/vf_yvu9.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/postproc/vf_yvu9.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include <inttypes.h>
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "xmpcore/mp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/xmpcore/mp_image.cpp
===================================================================
--- mplayerxp/xmpcore/mp_image.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/xmpcore/mp_image.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -6,7 +6,7 @@
#include <string.h>
#include "mplayerxp.h"
-#include "libvo/img_format.h"
+#include "libvo2/img_format.h"
#include "mp_image.h"
#include "osdep/fastmemcpy.h"
#define MSGT_CLASS MSGT_CPLAYER
Modified: mplayerxp/xmpcore/xmp_core.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_core.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/xmpcore/xmp_core.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -20,7 +20,7 @@
#include "xmp_core.h"
#include "libao2/audio_out.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "libmpcodecs/dec_video.h"
#include "libmpcodecs/dec_audio.h"
Modified: mplayerxp/xmpcore/xmp_core.h
===================================================================
--- mplayerxp/xmpcore/xmp_core.h 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/xmpcore/xmp_core.h 2012-12-11 16:32:57 UTC (rev 544)
@@ -14,7 +14,7 @@
#include "osdep/mplib.h"
using namespace mpxp;
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "libmpdemux/stheader.h"
namespace mpxp {
Modified: mplayerxp/xmpcore/xmp_vplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_vplayer.cpp 2012-12-11 16:20:06 UTC (rev 543)
+++ mplayerxp/xmpcore/xmp_vplayer.cpp 2012-12-11 16:32:57 UTC (rev 544)
@@ -9,7 +9,7 @@
#include "sig_hand.h"
#include "libao2/audio_out.h"
-#include "libvo/video_out.h"
+#include "libvo2/video_out.h"
#include "libmpdemux/demuxer_r.h"
#include "osdep/timer.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
