[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[576] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[576] mplayerxp
|
From: <nic...@us...> - 2012-12-19 08:57:58
|
Revision: 576
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=576&view=rev
Author: nickols_k
Date: 2012-12-19 08:57:43 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
minor antiviral patch
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/configure
mplayerxp/dump.cpp
mplayerxp/input2/Makefile
mplayerxp/input2/in_msg.h
mplayerxp/input2/input.cpp
mplayerxp/input2/input.h
mplayerxp/input2/joystick.cpp
mplayerxp/input2/lirc.cpp
mplayerxp/libao3/Makefile
mplayerxp/libao3/afmt.cpp
mplayerxp/libao3/afmt.h
mplayerxp/libao3/ao_alsa.cpp
mplayerxp/libao3/ao_arts.cpp
mplayerxp/libao3/ao_esd.cpp
mplayerxp/libao3/ao_jack.cpp
mplayerxp/libao3/ao_msg.h
mplayerxp/libao3/ao_nas.cpp
mplayerxp/libao3/ao_null.cpp
mplayerxp/libao3/ao_openal.cpp
mplayerxp/libao3/ao_oss.cpp
mplayerxp/libao3/ao_sdl.cpp
mplayerxp/libao3/ao_wav.cpp
mplayerxp/libao3/audio_out.cpp
mplayerxp/libao3/audio_out.h
mplayerxp/libao3/audio_out_internal.h
mplayerxp/libmpcodecs/Makefile
mplayerxp/libmpcodecs/ad.cpp
mplayerxp/libmpcodecs/ad_a52.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_dca.cpp
mplayerxp/libmpcodecs/ad_dmo.cpp
mplayerxp/libmpcodecs/ad_dshow.cpp
mplayerxp/libmpcodecs/ad_dvdpcm.cpp
mplayerxp/libmpcodecs/ad_faad.cpp
mplayerxp/libmpcodecs/ad_hwac3.cpp
mplayerxp/libmpcodecs/ad_lavc.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/ad_mp3.cpp
mplayerxp/libmpcodecs/ad_msg.h
mplayerxp/libmpcodecs/ad_null.cpp
mplayerxp/libmpcodecs/ad_pcm.cpp
mplayerxp/libmpcodecs/ad_qtaudio.cpp
mplayerxp/libmpcodecs/ad_real.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/ad_vorbis.cpp
mplayerxp/libmpcodecs/codecs_ld.cpp
mplayerxp/libmpcodecs/codecs_ld.h
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/liba52/Makefile
mplayerxp/libmpcodecs/liba52/a52.h
mplayerxp/libmpcodecs/liba52/bit_allocate.cpp
mplayerxp/libmpcodecs/liba52/bitstream.cpp
mplayerxp/libmpcodecs/liba52/crc.cpp
mplayerxp/libmpcodecs/liba52/downmix.cpp
mplayerxp/libmpcodecs/liba52/imdct.cpp
mplayerxp/libmpcodecs/liba52/parse.cpp
mplayerxp/libmpcodecs/liba52/resample.cpp
mplayerxp/libmpcodecs/libdca/Makefile
mplayerxp/libmpcodecs/libdca/bitstream.cpp
mplayerxp/libmpcodecs/libdca/dca.h
mplayerxp/libmpcodecs/libdca/downmix.cpp
mplayerxp/libmpcodecs/libdca/parse.cpp
mplayerxp/libmpcodecs/libdca/resample.cpp
mplayerxp/libmpcodecs/libnuppelvideo/Makefile
mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.cpp
mplayerxp/libmpcodecs/vd.cpp
mplayerxp/libmpcodecs/vd_divx4.cpp
mplayerxp/libmpcodecs/vd_dmo.cpp
mplayerxp/libmpcodecs/vd_dshow.cpp
mplayerxp/libmpcodecs/vd_huffyuv.cpp
mplayerxp/libmpcodecs/vd_lavc.cpp
mplayerxp/libmpcodecs/vd_libdv.cpp
mplayerxp/libmpcodecs/vd_libmpeg2.cpp
mplayerxp/libmpcodecs/vd_mpegpes.cpp
mplayerxp/libmpcodecs/vd_msg.h
mplayerxp/libmpcodecs/vd_null.cpp
mplayerxp/libmpcodecs/vd_nuv.cpp
mplayerxp/libmpcodecs/vd_qtvideo.cpp
mplayerxp/libmpcodecs/vd_raw.cpp
mplayerxp/libmpcodecs/vd_real.cpp
mplayerxp/libmpcodecs/vd_theora.cpp
mplayerxp/libmpcodecs/vd_vfw.cpp
mplayerxp/libmpcodecs/vd_xanim.cpp
mplayerxp/libmpcodecs/vd_xvid.cpp
mplayerxp/libmpconf/Makefile
mplayerxp/libmpconf/cfgparser.cpp
mplayerxp/libmpconf/codec-cfg.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpconf/m_property.cpp
mplayerxp/libmpconf/m_struct.cpp
mplayerxp/libmpconf/subopt-helper.cpp
mplayerxp/libmpconf/subopt-helper.h
mplayerxp/libmpdemux/Makefile
mplayerxp/libmpdemux/aviheader.h
mplayerxp/libmpdemux/aviprint.cpp
mplayerxp/libmpdemux/demux_ac3.cpp
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_asf.cpp
mplayerxp/libmpdemux/demux_avi.cpp
mplayerxp/libmpdemux/demux_bmp.cpp
mplayerxp/libmpdemux/demux_dca.cpp
mplayerxp/libmpdemux/demux_demuxers.cpp
mplayerxp/libmpdemux/demux_dv.cpp
mplayerxp/libmpdemux/demux_film.cpp
mplayerxp/libmpdemux/demux_flac.cpp
mplayerxp/libmpdemux/demux_fli.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mp3.cpp
mplayerxp/libmpdemux/demux_mpg.cpp
mplayerxp/libmpdemux/demux_mpxp64.cpp
mplayerxp/libmpdemux/demux_msg.h
mplayerxp/libmpdemux/demux_musepack.cpp
mplayerxp/libmpdemux/demux_nsv.cpp
mplayerxp/libmpdemux/demux_null.cpp
mplayerxp/libmpdemux/demux_nuv.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_pva.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_rawvideo.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_realaud.cpp
mplayerxp/libmpdemux/demux_roq.cpp
mplayerxp/libmpdemux/demux_smjpeg.cpp
mplayerxp/libmpdemux/demux_snd_au.cpp
mplayerxp/libmpdemux/demux_ts.cpp
mplayerxp/libmpdemux/demux_ty.cpp
mplayerxp/libmpdemux/demux_viv.cpp
mplayerxp/libmpdemux/demux_voc.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_wav.cpp
mplayerxp/libmpdemux/demux_y4m.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpdemux/demuxer.h
mplayerxp/libmpdemux/demuxer_info.h
mplayerxp/libmpdemux/demuxer_packet.h
mplayerxp/libmpdemux/demuxer_r.cpp
mplayerxp/libmpdemux/demuxer_stream.cpp
mplayerxp/libmpdemux/demuxer_stream.h
mplayerxp/libmpdemux/mp3_hdr.cpp
mplayerxp/libmpdemux/mpdemux.cpp
mplayerxp/libmpdemux/mpeg_hdr.cpp
mplayerxp/libmpdemux/mux_lavf.cpp
mplayerxp/libmpdemux/mux_mpxp64.cpp
mplayerxp/libmpdemux/mux_raw.cpp
mplayerxp/libmpdemux/muxer.cpp
mplayerxp/libmpdemux/parse_es.cpp
mplayerxp/libmpdemux/parse_mp4.cpp
mplayerxp/libmpdemux/stheader.cpp
mplayerxp/libmpdemux/sub_cc.cpp
mplayerxp/libmpdemux/sub_ty.cpp
mplayerxp/libmpdemux/yuv4mpeg.cpp
mplayerxp/libmpdemux/yuv4mpeg_ratio.cpp
mplayerxp/libmpstream2/Makefile
mplayerxp/libmpstream2/cache2.cpp
mplayerxp/libmpstream2/cdda.cpp
mplayerxp/libmpstream2/cddb.cpp
mplayerxp/libmpstream2/cookies.cpp
mplayerxp/libmpstream2/freesdp/Makefile
mplayerxp/libmpstream2/freesdp/common.cpp
mplayerxp/libmpstream2/freesdp/common.h
mplayerxp/libmpstream2/freesdp/errorlist.cpp
mplayerxp/libmpstream2/freesdp/parser.cpp
mplayerxp/libmpstream2/http.cpp
mplayerxp/libmpstream2/http.h
mplayerxp/libmpstream2/librtsp/Makefile
mplayerxp/libmpstream2/librtsp/rtsp.cpp
mplayerxp/libmpstream2/librtsp/rtsp_rtp.cpp
mplayerxp/libmpstream2/librtsp/rtsp_session.cpp
mplayerxp/libmpstream2/librtsp/rtsp_session.h
mplayerxp/libmpstream2/mrl.cpp
mplayerxp/libmpstream2/mrl.h
mplayerxp/libmpstream2/network.cpp
mplayerxp/libmpstream2/network.h
mplayerxp/libmpstream2/network_asf.cpp
mplayerxp/libmpstream2/network_asf.h
mplayerxp/libmpstream2/network_asf_mmst.cpp
mplayerxp/libmpstream2/network_nop.cpp
mplayerxp/libmpstream2/network_pnm.cpp
mplayerxp/libmpstream2/network_real_rtsp.cpp
mplayerxp/libmpstream2/network_rtp.cpp
mplayerxp/libmpstream2/network_rtsp.cpp
mplayerxp/libmpstream2/pnm.cpp
mplayerxp/libmpstream2/realrtsp/Makefile
mplayerxp/libmpstream2/realrtsp/asmrp.cpp
mplayerxp/libmpstream2/realrtsp/md5.h
mplayerxp/libmpstream2/realrtsp/real.cpp
mplayerxp/libmpstream2/realrtsp/rmff.cpp
mplayerxp/libmpstream2/realrtsp/rmff.h
mplayerxp/libmpstream2/realrtsp/sdpplin.cpp
mplayerxp/libmpstream2/realrtsp/xbuffer.cpp
mplayerxp/libmpstream2/realrtsp/xbuffer.h
mplayerxp/libmpstream2/rtp_cache.cpp
mplayerxp/libmpstream2/s_cdd.cpp
mplayerxp/libmpstream2/s_dvdnav.cpp
mplayerxp/libmpstream2/s_dvdread.cpp
mplayerxp/libmpstream2/s_file.cpp
mplayerxp/libmpstream2/s_ftp.cpp
mplayerxp/libmpstream2/s_lavc.cpp
mplayerxp/libmpstream2/s_network.cpp
mplayerxp/libmpstream2/s_null.cpp
mplayerxp/libmpstream2/s_oss.cpp
mplayerxp/libmpstream2/s_rtsp.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/s_udp.cpp
mplayerxp/libmpstream2/s_vcdnav.cpp
mplayerxp/libmpstream2/stream.cpp
mplayerxp/libmpstream2/stream.h
mplayerxp/libmpstream2/stream_internal.h
mplayerxp/libmpstream2/stream_msg.h
mplayerxp/libmpstream2/tcp.cpp
mplayerxp/libmpstream2/tvi/Makefile
mplayerxp/libmpstream2/tvi/frequencies.cpp
mplayerxp/libmpstream2/tvi/tvi_bsdbt848.cpp
mplayerxp/libmpstream2/tvi/tvi_dummy.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/libmpstream2/udp.cpp
mplayerxp/libmpstream2/url.cpp
mplayerxp/libmpsub/Makefile
mplayerxp/libmpsub/find_sub.cpp
mplayerxp/libmpsub/spudec.cpp
mplayerxp/libmpsub/subreader.cpp
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree/Makefile
mplayerxp/libplaytree/asxparser.cpp
mplayerxp/libplaytree/playtree.cpp
mplayerxp/libplaytree/playtreeparser.cpp
mplayerxp/libvo2/Makefile
mplayerxp/libvo2/aspect.cpp
mplayerxp/libvo2/aspect.h
mplayerxp/libvo2/font_load.cpp
mplayerxp/libvo2/img_format.cpp
mplayerxp/libvo2/img_format.h
mplayerxp/libvo2/jpeg_enc.cpp
mplayerxp/libvo2/osd_render.cpp
mplayerxp/libvo2/screenshot.cpp
mplayerxp/libvo2/sub.cpp
mplayerxp/libvo2/video_out.cpp
mplayerxp/libvo2/video_out.h
mplayerxp/libvo2/vidix_system.cpp
mplayerxp/libvo2/vo_fbdev.cpp
mplayerxp/libvo2/vo_msg.h
mplayerxp/libvo2/vo_null.cpp
mplayerxp/libvo2/vo_opengl.cpp
mplayerxp/libvo2/vo_sdl.cpp
mplayerxp/libvo2/vo_vesa.cpp
mplayerxp/libvo2/vo_x11.cpp
mplayerxp/libvo2/vo_xv.cpp
mplayerxp/libvo2/x11_system.cpp
mplayerxp/loader/Makefile
mplayerxp/loader/com.h
mplayerxp/loader/dmo/DMO_AudioDecoder.c
mplayerxp/loader/dmo/DMO_VideoDecoder.c
mplayerxp/loader/dmo/Makefile
mplayerxp/loader/dmo/dmo.c
mplayerxp/loader/driver.c
mplayerxp/loader/dshow/DS_AudioDecoder.c
mplayerxp/loader/dshow/DS_Filter.c
mplayerxp/loader/dshow/DS_VideoDecoder.c
mplayerxp/loader/dshow/Makefile
mplayerxp/loader/dshow/allocator.c
mplayerxp/loader/ldt_keeper.h
mplayerxp/loader/module.c
mplayerxp/loader/win32.c
mplayerxp/loader/wine/windef.h
mplayerxp/mplayerxp.cpp
mplayerxp/mplayerxp.h
mplayerxp/nls/Makefile
mplayerxp/nls/nls_msg.h
mplayerxp/nls/recode.cpp
mplayerxp/osdep/Makefile
mplayerxp/osdep/aclib.cpp
mplayerxp/osdep/bswap.h
mplayerxp/osdep/cpudetect.cpp
mplayerxp/osdep/fastmemcpy.h
mplayerxp/osdep/get_path.cpp
mplayerxp/osdep/getch2.cpp
mplayerxp/osdep/lrmi.cpp
mplayerxp/osdep/lrmi.h
mplayerxp/osdep/mp_malloc.cpp
mplayerxp/osdep/mplib.cpp
mplayerxp/osdep/mplib.h
mplayerxp/osdep/osdep_msg.h
mplayerxp/osdep/shmem.cpp
mplayerxp/osdep/timer-lx.cpp
mplayerxp/osdep/timer.cpp
mplayerxp/osdep/vbelib.cpp
mplayerxp/osdep/vbelib.h
mplayerxp/postproc/Makefile
mplayerxp/postproc/af.cpp
mplayerxp/postproc/af.h
mplayerxp/postproc/af_ao3.cpp
mplayerxp/postproc/af_channels.cpp
mplayerxp/postproc/af_crystality.cpp
mplayerxp/postproc/af_delay.cpp
mplayerxp/postproc/af_dyn.cpp
mplayerxp/postproc/af_echo3d.cpp
mplayerxp/postproc/af_equalizer.cpp
mplayerxp/postproc/af_export.cpp
mplayerxp/postproc/af_extrastereo.cpp
mplayerxp/postproc/af_ffenc.cpp
mplayerxp/postproc/af_format.cpp
mplayerxp/postproc/af_hrtf.cpp
mplayerxp/postproc/af_karaoke.cpp
mplayerxp/postproc/af_lp.cpp
mplayerxp/postproc/af_null.cpp
mplayerxp/postproc/af_pan.cpp
mplayerxp/postproc/af_raw.cpp
mplayerxp/postproc/af_resample.cpp
mplayerxp/postproc/af_scaletempo.cpp
mplayerxp/postproc/af_sinesuppress.cpp
mplayerxp/postproc/af_sub.cpp
mplayerxp/postproc/af_surround.cpp
mplayerxp/postproc/af_tools.cpp
mplayerxp/postproc/af_volnorm.cpp
mplayerxp/postproc/af_volume.cpp
mplayerxp/postproc/aflib.cpp
mplayerxp/postproc/aflib.h
mplayerxp/postproc/libmenu/Makefile
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/postprocess.cpp
mplayerxp/postproc/postprocess.h
mplayerxp/postproc/pp_msg.h
mplayerxp/postproc/swscale.cpp
mplayerxp/postproc/swscale.h
mplayerxp/postproc/vf.cpp
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_null.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_rectangle.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_vo2.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
mplayerxp/xmpcore/Makefile
mplayerxp/xmpcore/PointerProtector.h
mplayerxp/xmpcore/mp_aframe.cpp
mplayerxp/xmpcore/mp_aframe.h
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/mp_image.h
mplayerxp/xmpcore/sig_hand.cpp
mplayerxp/xmpcore/xmp_adecoder.cpp
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_context.cpp
mplayerxp/xmpcore/xmp_core.cpp
mplayerxp/xmpcore/xmp_core.h
mplayerxp/xmpcore/xmp_vdecoder.cpp
mplayerxp/xmpcore/xmp_vplayer.cpp
Added Paths:
-----------
mplayerxp/mpxp_msg.cpp
mplayerxp/mpxp_msg.h
mplayerxp/nls/mpxp_help-bg.h
mplayerxp/nls/mpxp_help-cz.h
mplayerxp/nls/mpxp_help-de.h
mplayerxp/nls/mpxp_help-dk.h
mplayerxp/nls/mpxp_help-el.h
mplayerxp/nls/mpxp_help-en.h
mplayerxp/nls/mpxp_help-es.h
mplayerxp/nls/mpxp_help-fr.h
mplayerxp/nls/mpxp_help-hu.h
mplayerxp/nls/mpxp_help-it.h
mplayerxp/nls/mpxp_help-ja.h
mplayerxp/nls/mpxp_help-ko.h
mplayerxp/nls/mpxp_help-mk.h
mplayerxp/nls/mpxp_help-nb.h
mplayerxp/nls/mpxp_help-nl.h
mplayerxp/nls/mpxp_help-no.h
mplayerxp/nls/mpxp_help-pl.h
mplayerxp/nls/mpxp_help-pt.h
mplayerxp/nls/mpxp_help-ro.h
mplayerxp/nls/mpxp_help-ru.h
mplayerxp/nls/mpxp_help-sk.h
mplayerxp/nls/mpxp_help-sv.h
mplayerxp/nls/mpxp_help-tr.h
mplayerxp/nls/mpxp_help-uk.h
mplayerxp/nls/mpxp_help-zh.h
Removed Paths:
-------------
mplayerxp/mp_msg.cpp
mplayerxp/mp_msg.h
mplayerxp/nls/help_mp-bg.h
mplayerxp/nls/help_mp-cz.h
mplayerxp/nls/help_mp-de.h
mplayerxp/nls/help_mp-dk.h
mplayerxp/nls/help_mp-el.h
mplayerxp/nls/help_mp-en.h
mplayerxp/nls/help_mp-es.h
mplayerxp/nls/help_mp-fr.h
mplayerxp/nls/help_mp-hu.h
mplayerxp/nls/help_mp-it.h
mplayerxp/nls/help_mp-ja.h
mplayerxp/nls/help_mp-ko.h
mplayerxp/nls/help_mp-mk.h
mplayerxp/nls/help_mp-nb.h
mplayerxp/nls/help_mp-nl.h
mplayerxp/nls/help_mp-no.h
mplayerxp/nls/help_mp-pl.h
mplayerxp/nls/help_mp-pt.h
mplayerxp/nls/help_mp-ro.h
mplayerxp/nls/help_mp-ru.h
mplayerxp/nls/help_mp-sk.h
mplayerxp/nls/help_mp-sv.h
mplayerxp/nls/help_mp-tr.h
mplayerxp/nls/help_mp-uk.h
mplayerxp/nls/help_mp-zh.h
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/Makefile 2012-12-19 08:57:43 UTC (rev 576)
@@ -7,7 +7,7 @@
# a BSD compatible 'install' program
INSTALL = install
-include mp_config.mak
+include mpxp_config.mak
TARGET_EXE = $(PROGNAME)
# these subdirectories required installation due binaries within them
@@ -21,7 +21,7 @@
MANDIR = ${prefix}/man
LDFLAGS += -Wl,-rpath,${CODECDIR}/codecs
-SRCS = mplayerxp.cpp dump.cpp mp_msg.cpp
+SRCS = mplayerxp.cpp dump.cpp mpxp_msg.cpp
OBJS = $(SRCS:.cpp=.o)
@@ -100,8 +100,8 @@
$(DO_MAKE)
-rm -f *~ $(TARGET_EXE) $(OBJS)
-rm -f *.o *.a .depend configure.log
- -rm -f mp_config.h mp_config.mak mp_conf_lavc.h version.h
- -rm -f cpuinfo help_mp.h
+ -rm -f mpxp_config.h mpxp_config.mak mpxp_conf_lavc.h version.h
+ -rm -f cpuinfo mpxp_help.h
dep: .depend
Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/configure 2012-12-19 08:57:43 UTC (rev 576)
@@ -20,14 +20,14 @@
#
# GOTCHAS:
# - config files are currently:
-# mp_config.h mp_config.mak libvo/mp_config.mak libao2/mp_config.mak
+# mpxp_config.h mpxp_config.mak
#
#############################################################################
. ../functions
init_functions
cd nls
-LANGUAGES=`echo help_mp-??.h | sed "s/help_mp-\(..\).h/\1/g"`
+LANGUAGES=`echo mpxp_help-??.h | sed "s/mpxp_help-\(..\).h/\1/g"`
cd ..
linguas=`echo $LANG | sed 's/^\([^_]*\).*$/\1/'`
test -z $linguas && linguas=en
@@ -226,7 +226,7 @@
test -n $gas && as=$gas
mktmps
-guess_target mp_config.mak mp_config.h
+guess_target mpxp_config.mak mpxp_config.h
# config files
@@ -323,15 +323,15 @@
test $($pkg_config --version 2>/dev/null) || die "no pkg-config found"
#############################################################################
enabled profile && disable fastcall
-print_config __USE mp_config.h mp_config.mak fastcall
+print_config __USE mpxp_config.h mpxp_config.mak fastcall
-test_optimizations mp_config.mak mp_config.h
+test_optimizations mpxp_config.mak mpxp_config.h
# Checking for GOMP
enabled gomp && check_ldflags -fopenmp || disable gomp
enabled gomp && require2 gomp omp.h omp_get_thread_num -lgomp || disable gomp
enabled gomp && check_cflags -fopenmp || disable gomp
-print_config HAVE_ mp_config.h mp_config.mak gomp
+print_config HAVE_ mpxp_config.h mpxp_config.mak gomp
#enabled gomp && check_cflags -ftree-parallelize-loops=4
#####################################################
add_cflags "-Warray-bounds -Wreturn-type -Wuninitialized -Wlogical-op -Waddress"
@@ -363,7 +363,7 @@
test -f "../lavc/libavcodec/avcodec.h" && enable lavc
disabled lavc && die "**FATAL**: local copy of lavc doesn't exist!"
add_cflags "-I$srcdir/../lavc"
-print_config HAVE_ mp_config.h mp_config.mak lavc
+print_config HAVE_ mpxp_config.h mpxp_config.mak lavc
# Configuring external lavc stuff
lavc_args="--enable-static --disable-shared --enable-gpl --enable-pthreads --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-ffprobe --disable-avdevice --disable-avfilter --disable-avresample"
if test -n $host ; then
@@ -387,24 +387,24 @@
echores "done"
###################################
-print_config ENABLE_ mp_config.h mp_config.mak gpl_only
+print_config ENABLE_ mpxp_config.h mpxp_config.mak gpl_only
check_header inttypes.h || die "cannot find header inttypes.h (see in DOC/faq.html)"
require2 libdl dlfcn.h dlsym -ldl || die "dynamic loader was not found"
-print_config HAVE_ mp_config.h mp_config.mak libdl
+print_config HAVE_ mpxp_config.h mpxp_config.mak libdl
require2 libkstat kstat.h kstat_open -lkstat
-print_config HAVE_ mp_config.h mp_config.mak libkstat
+print_config HAVE_ mpxp_config.h mpxp_config.mak libkstat
require2 posix4 time.h nanosleep -lposix4
-print_config HAVE_ mp_config.h mp_config.mak posix4
+print_config HAVE_ mpxp_config.h mpxp_config.mak posix4
check_func2 time.h nanosleep
-print_config HAVE_ mp_config.h mp_config.mak nanosleep
+print_config HAVE_ mpxp_config.h mpxp_config.mak nanosleep
check_func2 execinfo.h backtrace
-print_config HAVE_ mp_config.h mp_config.mak backtrace
+print_config HAVE_ mpxp_config.h mpxp_config.mak backtrace
disable inet_pton
if enabled streaming ; then
@@ -418,18 +418,18 @@
# well, try alternative
if disabled inet_pton ; then
require2 aton "sys/types.h sys/socket.h arpa/inet.h" inet_aton
-print_config USE_ mp_config.h mp_config.mak aton
+print_config USE_ mpxp_config.h mpxp_config.mak aton
fi
-print_config HAVE_ mp_config.h mp_config.mak socklib
+print_config HAVE_ mpxp_config.h mpxp_config.mak socklib
if enabled winsock2 && ! cygwin ; then
require2 winsock2 winsock2.h gethostbyname -lws2_32
-print_config HAVE_ mp_config.h mp_config.mak winsock2
+print_config HAVE_ mpxp_config.h mpxp_config.mak winsock2
fi
fi #enabled streaming
disabled inet_pton && disable streaming
-print_config HAVE_ mp_config.h mp_config.mak streaming
+print_config HAVE_ mpxp_config.h mpxp_config.mak streaming
enabled streaming && inputmodules="streaming $inputmodules" || noinputmodules="streaming $noinputmodules"
disabled streaming && disable af_inet6
@@ -437,7 +437,7 @@
if enabled af_inet6 ; then
enabled winsock2 && require3 af_inet6 ws2tcpip.h AF_INET6 socket
disabled winsock2 && require3 af_inet6 "sys/socket.h netinet/in.h" AF_INET6 socket
-print_config HAVE_ mp_config.h mp_config.mak af_inet6
+print_config HAVE_ mpxp_config.h mpxp_config.mak af_inet6
fi
# find if .align arg is power-of-two or not
@@ -471,22 +471,22 @@
echores "$vm_pagesize"
check_func3 _ISOC9X_SOURCE math.h lrint -lm
-print_config HAVE_ mp_config.h mp_config.mak lrint
+print_config HAVE_ mpxp_config.h mpxp_config.mak lrint
check_func3 _ISOC9X_SOURCE math.h llrint -lm
-print_config HAVE_ mp_config.h mp_config.mak llrint
+print_config HAVE_ mpxp_config.h mpxp_config.mak llrint
check_func3 _ISOC9X_SOURCE math.h HUGE -lm
-print_config HAVE_ mp_config.h mp_config.mak HUGE
+print_config HAVE_ mpxp_config.h mpxp_config.mak HUGE
check_func2 "sys/types.h sys/mman.h" mmap
sys_mman_h=$mmap
-print_config HAVE_ mp_config.h mp_config.mak sys_mman_h
+print_config HAVE_ mpxp_config.h mpxp_config.mak sys_mman_h
enabled mmap && check_func2 "sys/mman.h" mlock
-print_config HAVE_ mp_config.h mp_config.mak mlock
+print_config HAVE_ mpxp_config.h mpxp_config.mak mlock
check_func2 "stdio.h stdarg.h" vsscanf
-print_config HAVE_ mp_config.h mp_config.mak vsscanf
+print_config HAVE_ mpxp_config.h mpxp_config.mak vsscanf
if enabled termcap; then
disable termcap
@@ -494,43 +494,43 @@
disabled termcap && require2 termcap stdio.h tgetent $ld_i
enabled termcap && break
done
-print_config HAVE_ mp_config.h mp_config.mak termcap
+print_config HAVE_ mpxp_config.h mpxp_config.mak termcap
fi
if enabled termios; then
check_header sys/termios.h
-print_config HAVE_ mp_config.h mp_config.mak sys_termios_h
+print_config HAVE_ mpxp_config.h mpxp_config.mak sys_termios_h
disabled sys_termios_h && check_header termios.h
-disabled sys_termios_h && print_config HAVE_ mp_config.h mp_config.mak termios_h
+disabled sys_termios_h && print_config HAVE_ mpxp_config.h mpxp_config.mak termios_h
fi
enabled shm && require2 shm "sys/types.h sys/shm.h" shmget
-print_config HAVE_ mp_config.h mp_config.mak shm
+print_config HAVE_ mpxp_config.h mpxp_config.mak shm
require2 zlib zlib.h inflate -lz
-print_config HAVE_ mp_config.h mp_config.mak zlib
+print_config HAVE_ mpxp_config.h mpxp_config.mak zlib
if linux; then
enabled rtc && require2 rtc "sys/ioctl.h linux/rtc.h" RTC_IRQP_READ
-print_config HAVE_ mp_config.h mp_config.mak rtc
+print_config HAVE_ mpxp_config.h mpxp_config.mak rtc
fi
if enabled iconv; then
require2 giconv giconv.h iconv_open -lgiconv
-print_config HAVE_ mp_config.h mp_config.mak giconv
+print_config HAVE_ mpxp_config.h mpxp_config.mak giconv
disable iconv
for ld_i in "" -liconv ; do
disabled iconv && require2 iconv iconv.h iconv_open $ld_i
enabled iconv && break
done
-print_config HAVE_ mp_config.h mp_config.mak iconv
+print_config HAVE_ mpxp_config.h mpxp_config.mak iconv
fi
enabled lirc && require2 lirc lirc/lirc_client.h lirc_init -llirc_client
-print_config HAVE_ mp_config.h mp_config.mak lirc
+print_config HAVE_ mpxp_config.h mpxp_config.mak lirc
enabled lircc && require2 lircc lirc/lircc.h lircc_init -llircc
-print_config HAVE_ mp_config.h mp_config.mak lircc
+print_config HAVE_ mpxp_config.h mpxp_config.mak lircc
disable pthread
for ld_i in "-lpthreadGC2" "-lpthread" "-pthread" "" ; do
@@ -538,23 +538,23 @@
enabled pthread && break
done
disabled pthread && die "Lib pthread not found. (needed by xp mode)"
-print_config HAVE_ mp_config.h mp_config.mak pthread
+print_config HAVE_ mpxp_config.h mpxp_config.mak pthread
check_func2 malloc.h malloc
disabled malloc && die "malloc is not supported by your system"
-print_config HAVE_ mp_config.h mp_config.mak malloc
+print_config HAVE_ mpxp_config.h mpxp_config.mak malloc
check_func2 malloc.h memalign
disabled memalign && die "memalign is not supported by your system"
-print_config HAVE_ mp_config.h mp_config.mak memalign
+print_config HAVE_ mpxp_config.h mpxp_config.mak memalign
check_func2 alloca.h alloca
-print_config HAVE_ mp_config.h mp_config.mak alloca
+print_config HAVE_ mpxp_config.h mpxp_config.mak alloca
require2 sys_soundcard_h sys/soundcard.h SNDCARD_SB
-print_config HAVE_ mp_config.h mp_config.mak sys_soundcard_h
+print_config HAVE_ mpxp_config.h mpxp_config.mak sys_soundcard_h
require2 soundcard_h soundcard.h SNDCARD_SB
-print_config HAVE_ mp_config.h mp_config.mak soundcard_h
+print_config HAVE_ mpxp_config.h mpxp_config.mak soundcard_h
# XXX: FIXME, add runtime checking
echocheck "linux devfs"
@@ -564,15 +564,15 @@
echocheck "language"
linguas=$language
test -z $linguas && linguas=`echo $LANG | sed 's/^\([^_]*\).*$/\1/'`
-if test -f "nls/help_mp-$linguas.h" ; then
+if test -f "nls/mpxp_help-$linguas.h" ; then
echores "$linguas"
else
echores "$linguas not found, using en"
linguas="en"
fi
-mp_help="nls/help_mp-$linguas.h"
-test -f nls/help_mp-$linguas.h || die "nls/help_mp-$linguas.h not found"
-echo "#define I18N_LANGUAGE \"$linguas\"" >>mp_config.h
+mpxp_help="nls/mpxp_help-$linguas.h"
+test -f nls/mpxp_help-$linguas.h || die "nls/mpxp_help-$linguas.h not found"
+echo "#define I18N_LANGUAGE \"$linguas\"" >>mpxp_config.h
enabled gpl_only && disable win32loader
@@ -580,7 +580,7 @@
disable win32loader
fi
win32 && add_ldflags -lkernel32
-print_config ENABLE_ mp_config.h mp_config.mak win32loader
+print_config ENABLE_ mpxp_config.h mpxp_config.mak win32loader
echo -n "win32 dll's ... "
if test -z "$win32libdir" ; then
@@ -592,29 +592,29 @@
done
fi
echo "$win32libdir"
-echo "#define WIN32_PATH \"$win32libdir\"" >>mp_config.h
+echo "#define WIN32_PATH \"$win32libdir\"" >>mpxp_config.h
#########
# VIDEO #
#########
check_pkg x11 x11
enabled x11 && require2 x11 "X11/Xlib.h X11/Xutil.h" XCreateWindow -lXext
-print_config HAVE_ mp_config.h mp_config.mak x11
+print_config HAVE_ mpxp_config.h mpxp_config.mak x11
enabled x11 && vomodules="x11 $vomodules" || novomodules="x11 $novomodules"
disabled x11 && disable xdpms
enabled xdpms && require2 xdpms "X11/Xlib.h X11/extensions/dpms.h" DPMSQueryExtension
disabled xdpms && require2 xdpms "X11/Xlib.h X11/extensions/dpms.h" DPMSQueryExtension -lXdpms
-print_config HAVE_ mp_config.h mp_config.mak xdpms
+print_config HAVE_ mpxp_config.h mpxp_config.mak xdpms
disabled x11 && disable xv
enabled xv && require2 xv "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv
-print_config HAVE_ mp_config.h mp_config.mak xv
+print_config HAVE_ mpxp_config.h mpxp_config.mak xv
enabled xv && vomodules="xv $vomodules" || novomodules="xv $novomodules"
disabled x11 && disable xinerama
enabled xinerama && require2 xinerama "X11/Xlib.h X11/extensions/Xinerama.h" XineramaIsActive -lXinerama
-print_config HAVE_ mp_config.h mp_config.mak xinerama
+print_config HAVE_ mpxp_config.h mpxp_config.mak xinerama
if win32 ; then
enabled opengl && require2 opengl "windows.h GL/gl.h" wglCreateContext -lopengl32 -lgdi32
@@ -622,7 +622,7 @@
disabled x11 && disable opengl
enabled opengl && require2 opengl "GL/gl.h GL/glx.h GL/glut.h" glutInitWindowSize -lglut -lGL -lGLU
fi
-print_config HAVE_ mp_config.h mp_config.mak opengl
+print_config HAVE_ mpxp_config.h mpxp_config.mak opengl
enabled opengl && vomodules="opengl $vomodules" || novomodules="opengl $novomodules"
# Note: the -lXxf86vm library is the VideoMode extension and though it's not
@@ -632,12 +632,12 @@
# If you run into problems, remove '-lXxf86vm'.
disabled x11 && disable xf86vm
enabled xf86vm && require2 xf86vm "X11/Xlib.h X11/extensions/xf86vmode.h" XF86VidModeQueryExtension -lXxf86vm
-print_config HAVE_ mp_config.h mp_config.mak xf86vm
+print_config HAVE_ mpxp_config.h mpxp_config.mak xf86vm
disabled x11 && disable dga
enabled fbdev && require2 fbdev "sys/ioctl.h linux/fb.h" ioctl
-print_config HAVE_ mp_config.h mp_config.mak fbdev
+print_config HAVE_ mpxp_config.h mpxp_config.mak fbdev
enabled fbdev && vomodules="fbdev $vomodules" || novomodules="fbdev $novomodules"
if test "$fbdev_nocopy" = yes ; then
def_fbdev_nocopy='#define USE_CONVERT2FB 1'
@@ -645,15 +645,15 @@
if enabled png; then
require2 png png.h PNG_LIBPNG_VER_STRING -lpng
-print_config HAVE_ mp_config.h mp_config.mak png
+print_config HAVE_ mpxp_config.h mpxp_config.mak png
disabled png && require2 libpng_png libpng/png.h PNG_LIBPNG_VER_STRING -lpng -lm
-print_config HAVE_ mp_config.h mp_config.mak libpng_png
+print_config HAVE_ mpxp_config.h mpxp_config.mak libpng_png
enabled libpng_png && enable png
fi
enabled png && vomodules="png $vomodules" || novomodules="png $novomodules"
enabled jpg && require2 jpeg "stdio.h stdlib.h setjmp.h string.h jpeglib.h" jpeg_write_scanlines -ljpeg
-print_config HAVE_ mp_config.h mp_config.mak jpeg
+print_config HAVE_ mpxp_config.h mpxp_config.mak jpeg
enabled jpeg && vomodules="jpeg $vomodules" || novomodules="jpeg $novomodules"
x86_32 || disable vesa
@@ -663,7 +663,7 @@
vesa=$_vesa
enabled vesa && require3 vesa "asm/vm86.h string.h" X86_EFLAGS_VIF memset
fi
-print_config HAVE_ mp_config.h mp_config.mak vesa
+print_config HAVE_ mpxp_config.h mpxp_config.mak vesa
enabled vesa && vomodules="vesa $vomodules" || novomodules="vesa $novomodules"
#################
@@ -672,21 +672,21 @@
enabled sdl && check_pkg sdl sdl
enabled sdl && require2 sdl SDL/SDL.h SDL_CreateYUVOverlay
-print_config HAVE_ mp_config.h mp_config.mak sdl
+print_config HAVE_ mpxp_config.h mpxp_config.mak sdl
disabled sdl && disable sdl_image
if enabled sdl; then
enabled sdl_image && require2 sdl_image SDL/SDL_image.h IMG_Load_RW -lSDL_image
-print_config HAVE_ mp_config.h mp_config.mak sdl_image
+print_config HAVE_ mpxp_config.h mpxp_config.mak sdl_image
fi
enabled sdl && aomodules="sdl $aomodules" || noaomodules="sdl $noaomodules"
enabled sdl && vomodules="sdl $vomodules" || novomodules="sdl $novomodules"
enabled sdl_image && vomodules="sdl_image $vomodules" || novomodules="sdl_image $novomodules"
enabled libcdio && require2 libcdio "cdio/cdio.h" cdio_read_mode2_sectors -lcdio
-print_config HAVE_ mp_config.h mp_config.mak libcdio
+print_config HAVE_ mpxp_config.h mpxp_config.mak libcdio
enabled libcdio && require2 libcdio_cdda "cdio/cdda.h" cdio_cddap_read -lcdio_cdda
-print_config HAVE_ mp_config.h mp_config.mak libcdio_cdda
+print_config HAVE_ mpxp_config.h mpxp_config.mak libcdio_cdda
enabled libcdio_cdda && inputmodules="cdda $inputmodules" || noinputmodules="cdda $noinputmodules"
#########
@@ -695,7 +695,7 @@
enabled ossaudio && require2 ossaudio sys/soundcard.h SNDCTL_DSP_SETFRAGMENT
oss_audio=$ossaudio
-print_config USE_ mp_config.h mp_config.mak oss_audio
+print_config USE_ mpxp_config.h mpxp_config.mak oss_audio
enabled ossaudio && aomodules="oss $aomodules" || noaomodules="oss $noaomodules"
if test "$linux_devfs" = yes; then
def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
@@ -706,71 +706,71 @@
fi
enabled alsa && require2 alsa alsa/asoundlib.h SND_LIB_MAJOR -lasound
-print_config HAVE_ mp_config.h mp_config.mak alsa
+print_config HAVE_ mpxp_config.h mpxp_config.mak alsa
enabled alsa && aomodules="alsa $aomodules" || noaomodules="alsa $noaomodules"
# It seems that aRts doesn't support pkg-config
enabled arts && check_cflags $(artsc-config --cflags) && add_cflags $(artsc-config --cflags) || disable arts
enabled arts && check_ldflags $(artsc-config --libs) && add_extralibs $(artsc-config --libs) || disable arts
enabled arts && require2 arts artsc.h arts_write -lartsc
-print_config HAVE_ mp_config.h mp_config.mak arts
+print_config HAVE_ mpxp_config.h mpxp_config.mak arts
enabled arts && aomodules="arts $aomodules" || noaomodules="arts $noaomodules"
check_pkg esd esound
enabled esd && require2 esd esd.h esd_open_sound
-print_config HAVE_ mp_config.h mp_config.mak esd
+print_config HAVE_ mpxp_config.h mpxp_config.mak esd
enabled esd && aomodules="esd $aomodules" || noaomodules="esd $noaomodules"
enabled openal && require2 openal AL/al.h alSourceQueueBuffers -lopenal
-print_config HAVE_ mp_config.h mp_config.mak openal
+print_config HAVE_ mpxp_config.h mpxp_config.mak openal
enabled openal && aomodules="openal $aomodules" || noaomodules="openal $noaomodules"
enabled nas && require2 nas audio/audiolib.h AuOpenServer -laudio
-print_config HAVE_ mp_config.h mp_config.mak nas
+print_config HAVE_ mpxp_config.h mpxp_config.mak nas
enabled nas && aomodules="nas $aomodules" || noaomodules="nas $noaomodules"
check_pkg jack jack
enabled jack && require2 jack jack/jack.h jack_client_open
-print_config HAVE_ mp_config.h mp_config.mak jack
+print_config HAVE_ mpxp_config.h mpxp_config.mak jack
enabled jack && aomodules="jack $aomodules" || noaomodules="jack $noaomodules"
enabled libdvdread && require2 libdvdread "stdint.h dvdread/dvd_reader.h dvdread/ifo_types.h dvdread/ifo_read.h dvdread/nav_read.h" DVDOpenFile -ldvdread
dvdread=$libdvdread
-print_config USE_ mp_config.h mp_config.mak dvdread
+print_config USE_ mpxp_config.h mpxp_config.mak dvdread
enabled libdvdread && inputmodules="libdvdread $inputmodules" || noinputmodules="libdvdread $noinputmodules"
enabled libdvdnav && require2 libdvdnav dvdnav/dvdnav.h dvdnav_set_PGC_positioning_flag -ldvdnav
dvdnav=$libdvdnav
-print_config USE_ mp_config.h mp_config.mak dvdnav
+print_config USE_ mpxp_config.h mpxp_config.mak dvdnav
enabled libdvdnav && inputmodules="libdvdnav $inputmodules" || noinputmodules="libdvdnav $noinputmodules"
enabled libvcd && require2 libvcd libvcd/info.h vcdinfo_open -lvcdinfo
-print_config USE_ mp_config.h mp_config.mak libvcd
+print_config USE_ mpxp_config.h mpxp_config.mak libvcd
enabled libvcd && inputmodules="libvcd $inputmodules" || noinputmodules="libvcd $noinputmodules"
enabled libdv && check_pkg libdv libdv
enabled libdv && require2 libdv "libdv/dv.h" dv_encoder_new -ldv
-print_config HAVE_ mp_config.h mp_config.mak libdv
+print_config HAVE_ mpxp_config.h mpxp_config.mak libdv
enabled libdv && inputmodules="libdv $inputmodules" || noinputmodules="libdv $noinputmodules"
enabled fastmemcpy && x86 || disable fastmemcpy
-print_config USE_ mp_config.h mp_config.mak fastmemcpy
+print_config USE_ mpxp_config.h mpxp_config.mak fastmemcpy
-enabled tv && print_config USE_ mp_config.h mp_config.mak tv
+enabled tv && print_config USE_ mpxp_config.h mpxp_config.mak tv
enabled tv && inputmodules="tv $inputmodules" || noinputmodules="tv $noinputmodules"
-print_config HAVE_ mp_config.h mp_config.mak audio_select
+print_config HAVE_ mpxp_config.h mpxp_config.mak audio_select
enabled libvorbis && check_pkg libvorbis vorbis
-print_config HAVE_ mp_config.h mp_config.mak libvorbis
+print_config HAVE_ mpxp_config.h mpxp_config.mak libvorbis
enabled libvorbis && inputmodules="libvorbis $inputmodules" || noinputmodules="libvorbis $noinputmodules"
enabled libtheora && check_pkg libtheora theora
-print_config HAVE_ mp_config.h mp_config.mak libtheora
+print_config HAVE_ mpxp_config.h mpxp_config.mak libtheora
enabled libtheora && inputmodules="libtheora $inputmodules" || noinputmodules="libtheora $noinputmodules"
enabled libbz2 && require2 libbz2 bzlib.h BZ2_bzlibVersion -lbz2 || disable libbz2
-print_config HAVE_ mp_config.h mp_config.mak libbz2
+print_config HAVE_ mpxp_config.h mpxp_config.mak libbz2
CFLAGS="$CFLAGS -W -Wall -Wextra -Wshadow"
# Thread support
@@ -792,12 +792,12 @@
# Checking for VIDIX
enabled vidix && xxrequire2 vidix "vidix/vidix.h vidix/vidixlibxx.h" Vidix -lvidixxx
-print_config CONFIG_ mp_config.h mp_config.mak vidix
+print_config CONFIG_ mpxp_config.h mpxp_config.mak vidix
enabled x11 && enabled vidix && vomodules=":vidix $vomodules" || novomodules=":vidix $novomodules"
enabled joystick && test linux || disable joystick
-print_config HAVE_ mp_config.h mp_config.mak joystick
+print_config HAVE_ mpxp_config.h mpxp_config.mak joystick
# pseudo-ramdom names
cat > $TMPC << EOF
@@ -885,8 +885,8 @@
./version.sh
#############################################################################
-echo "Creating mp_config.mak"
-cat >> mp_config.mak << EOF
+echo "Creating mpxp_config.mak"
+cat >> mpxp_config.mak << EOF
# -------- Generated by configure -----------
LANG = C
@@ -922,13 +922,13 @@
# --- HAZARDOUS STUFF
EOF
-echo "EXTRALIBS=$extralibs" >> mp_config.mak
-echo "LDFLAGS=$LDFLAGS" >> mp_config.mak
-echo "LDXXFLAGS=$LDXXFLAGS" >> mp_config.mak
+echo "EXTRALIBS=$extralibs" >> mpxp_config.mak
+echo "LDFLAGS=$LDFLAGS" >> mpxp_config.mak
+echo "LDXXFLAGS=$LDXXFLAGS" >> mpxp_config.mak
#############################################################################
-echo "Creating mp_config.h"
-cat >> mp_config.h << EOF
+echo "Creating mpxp_config.h"
+cat >> mpxp_config.h << EOF
#ifndef MPXP_CONFIG_H
#define MPXP_CONFIG_H 1
/* -------- This file has been automatically generated by configure ---------
@@ -1133,16 +1133,21 @@
#############################################################################
-echo "Creating help_mp.h"
-cat > help_mp.h << EOF
-#include "$mp_help"
-#include "nls/help_mp-en.h"
+echo "Creating mpxp_help.h"
+cat > mpxp_help.h << EOF
+#ifndef __MPXP_HELP_H_INCLUDED
+#define __MPXP_HELP_H_INCLUDED 1
+
+#include "$mpxp_help"
+#include "nls/mpxp_help-en.h"
+
+#endif
EOF
-echo "Creating mp_conf_lavc.h"
-cat > mp_conf_lavc.h << EOF
-#ifndef __MP_CONF_LAVC_H_INCLUDED__
-#define __MP_CONF_LAVC_H_INCLUDED__ 1
+echo "Creating mpxp_conf_lavc.h"
+cat > mpxp_conf_lavc.h << EOF
+#ifndef __MPXP_CONF_LAVC_H_INCLUDED__
+#define __MPXP_CONF_LAVC_H_INCLUDED__ 1
#include <stdint.h>
#ifdef __cplusplus
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/dump.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
@@ -11,14 +11,14 @@
#include <math.h>
#include "xmpcore/sig_hand.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "input2/input.h"
#include "mplayerxp.h"
#include "libmpdemux/muxer.h"
#include "libmpstream2/stream.h"
#include "libmpstream2/mrl.h"
#define MSGT_CLASS MSGT_GLOBAL
-#include "mp_msg.h"
+#include "mpxp_msg.h"
#include "dump.h"
namespace mpxp {
Modified: mplayerxp/input2/Makefile
===================================================================
--- mplayerxp/input2/Makefile 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/Makefile 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,5 +1,5 @@
-include ../mp_config.mak
+include ../mpxp_config.mak
LIBNAME = libinput2.a
Modified: mplayerxp/input2/in_msg.h
===================================================================
--- mplayerxp/input2/in_msg.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/in_msg.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -2,6 +2,6 @@
#define IN_MSG_H
#define MSGT_CLASS MSGT_INPUT
-#include "mp_msg.h"
+#include "mpxp_msg.h"
#endif
Modified: mplayerxp/input2/input.cpp
===================================================================
--- mplayerxp/input2/input.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/input.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdlib.h>
Modified: mplayerxp/input2/input.h
===================================================================
--- mplayerxp/input2/input.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/input.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,6 +1,6 @@
#ifndef INPUT_H_INCLUDED
#define INPUT_H_INCLUDED 1
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
Modified: mplayerxp/input2/joystick.cpp
===================================================================
--- mplayerxp/input2/joystick.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/joystick.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
Modified: mplayerxp/input2/lirc.cpp
===================================================================
--- mplayerxp/input2/lirc.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/input2/lirc.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
@@ -13,7 +13,7 @@
#include <sys/time.h>
#include <stdlib.h>
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "input.h"
#include "in_msg.h"
Modified: mplayerxp/libao3/Makefile
===================================================================
--- mplayerxp/libao3/Makefile 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/Makefile 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,5 +1,5 @@
-include ../mp_config.mak
+include ../mpxp_config.mak
LIBNAME = libao3.a
Modified: mplayerxp/libao3/afmt.cpp
===================================================================
--- mplayerxp/libao3/afmt.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/afmt.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include "afmt.h"
Modified: mplayerxp/libao3/afmt.h
===================================================================
--- mplayerxp/libao3/afmt.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/afmt.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -9,7 +9,7 @@
#include <soundcard.h> /* OpenBSD have this instead of <sys/soundcard> */
#endif
#endif
-#include "mp_config.h"
+#include "mpxp_config.h"
/* standard, old OSS audio formats */
#ifndef AFMT_MU_LAW
Modified: mplayerxp/libao3/ao_alsa.cpp
===================================================================
--- mplayerxp/libao3/ao_alsa.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_alsa.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_arts.cpp
===================================================================
--- mplayerxp/libao3/ao_arts.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_arts.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_esd.cpp
===================================================================
--- mplayerxp/libao3/ao_esd.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_esd.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_jack.cpp
===================================================================
--- mplayerxp/libao3/ao_jack.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_jack.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
@@ -36,7 +36,7 @@
#include "osdep/timer.h"
#include "ao_msg.h"
-#include "mp_conf_lavc.h"
+#include "mpxp_conf_lavc.h"
#include <jack/jack.h>
namespace mpxp {
Modified: mplayerxp/libao3/ao_msg.h
===================================================================
--- mplayerxp/libao3/ao_msg.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_msg.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -2,6 +2,6 @@
#define AO_MSG_H
#define MSGT_CLASS MSGT_AO
-#include "mp_msg.h"
+#include "mpxp_msg.h"
#endif
Modified: mplayerxp/libao3/ao_nas.cpp
===================================================================
--- mplayerxp/libao3/ao_nas.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_nas.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_null.cpp
===================================================================
--- mplayerxp/libao3/ao_null.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_null.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdint.h>
Modified: mplayerxp/libao3/ao_openal.cpp
===================================================================
--- mplayerxp/libao3/ao_openal.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_openal.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_oss.cpp
===================================================================
--- mplayerxp/libao3/ao_oss.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_oss.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -261,7 +261,7 @@
int _r=0;
MSG_WARN("OSS-CONF: driver doesn't support SNDCTL_DSP_GETOSPACE :-(\n");
if(::ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &_r)==-1){
- MSG_V("OSS-CONF: %d bytes/frag (mp_config.h)\n",_outburst);
+ MSG_V("OSS-CONF: %d bytes/frag (mpxp_config.h)\n",_outburst);
} else {
_outburst=r;
MSG_V("OSS-CONF: %d bytes/frag (GETBLKSIZE)\n",_outburst);
@@ -291,7 +291,7 @@
delete data;
if(_buffersize==0){
MSG_ERR("\n *** OSS-CONF: Your audio driver DOES NOT support select() ***\n"
- "Recompile mplayerxp with #undef HAVE_AUDIO_SELECT in mp_config.h !\n\n");
+ "Recompile mplayerxp with #undef HAVE_AUDIO_SELECT in mpxp_config.h !\n\n");
return MPXP_False;
}
#endif
Modified: mplayerxp/libao3/ao_sdl.cpp
===================================================================
--- mplayerxp/libao3/ao_sdl.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_sdl.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libao3/ao_wav.cpp
===================================================================
--- mplayerxp/libao3/ao_wav.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/ao_wav.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
@@ -31,7 +31,7 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "libvo2/video_out.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "ao_msg.h"
#ifdef __MINGW32__
Modified: mplayerxp/libao3/audio_out.cpp
===================================================================
--- mplayerxp/libao3/audio_out.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/audio_out.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libao3/audio_out.h
===================================================================
--- mplayerxp/libao3/audio_out.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/audio_out.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,6 +1,6 @@
#ifndef __AUDIO_OUT_H
#define __AUDIO_OUT_H 1
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "xmpcore/xmp_enums.h"
#include <string>
Modified: mplayerxp/libao3/audio_out_internal.h
===================================================================
--- mplayerxp/libao3/audio_out_internal.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libao3/audio_out_internal.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,6 +1,6 @@
#ifndef __AO_INTERNAL_H_INCLUDED
#define __AO_INTERNAL_H_INCLUDED 1
-#include "mp_config.h"
+#include "mpxp_config.h"
#include <string>
Modified: mplayerxp/libmpcodecs/Makefile
===================================================================
--- mplayerxp/libmpcodecs/Makefile 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/Makefile 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-include ../mp_config.mak
+include ../mpxp_config.mak
LIBNAME = libmpcodecs.a
SUBDIRS = libnuppelvideo liba52 libdca
Modified: mplayerxp/libmpcodecs/ad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
Modified: mplayerxp/libmpcodecs/ad_a52.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -11,7 +11,7 @@
#include "codecs_ld.h"
#include "mplayerxp.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "osdep/cpudetect.h"
#include "osdep/bswap.h"
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -11,7 +11,7 @@
#include "loader/wineacm.h"
#include "libmpdemux/aviprint.h"
#include "libao3/afmt.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
static const ad_info_t info = {
"Win32/ACM decoders",
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -11,7 +11,7 @@
#include "codecs_ld.h"
#include "mplayerxp.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "osdep/cpudetect.h"
#include "libdca/dca.h"
Modified: mplayerxp/libmpcodecs/ad_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_dmo.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -9,7 +9,7 @@
#include "codecs_ld.h"
#include "mplayerxp.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "ad_internal.h"
#include "ad_msg.h"
Modified: mplayerxp/libmpcodecs/ad_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_dshow.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -6,7 +6,7 @@
#include <unistd.h>
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "loader/dshow/DS_AudioDecoder.h"
#include "codecs_ld.h"
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/* ad_faad.c - MPlayer AAC decoder using libfaad2
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "osdep/bswap.h"
#include "codecs_ld.h"
#include "ad_internal.h"
Modified: mplayerxp/libmpcodecs/ad_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -10,7 +10,7 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include "ad_internal.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "codecs_ld.h"
#include "osdep/cpudetect.h"
#include "osdep/bswap.h"
Modified: mplayerxp/libmpcodecs/ad_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_lavc.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_lavc.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -11,11 +11,11 @@
#include "libao3/afmt.h"
#include "ad_internal.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#include "osdep/bswap.h"
#include "libmpconf/codec-cfg.h"
-#include "mp_conf_lavc.h"
+#include "mpxp_conf_lavc.h"
#include "codecs_ld.h"
struct ad_private_t {
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -8,7 +8,7 @@
#include <unistd.h>
#include <math.h>
-#include "help_mp.h"
+#include "mpxp_help.h"
#include <libdv/dv.h>
#include <libdv/dv_types.h>
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/ad_msg.h
===================================================================
--- mplayerxp/libmpcodecs/ad_msg.h 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_msg.h 2012-12-19 08:57:43 UTC (rev 576)
@@ -2,6 +2,6 @@
#define AD_MSG_H 1
#define MSGT_CLASS MSGT_DECAUDIO
-#include "mp_msg.h"
+#include "mpxp_msg.h"
#endif
Modified: mplayerxp/libmpcodecs/ad_null.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_null.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_null.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
@@ -11,7 +11,7 @@
#include "loader/wine/windef.h"
#include "libao3/afmt.h"
#include "libmpdemux/aviprint.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
static const ad_info_t info = {
"TWinVQ decoder",
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
#include <stdio.h>
Modified: mplayerxp/libmpcodecs/codecs_ld.cpp
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.cpp 2012-12-18 16:22:42 UTC (rev 575)
+++ mplayerxp/libmpcodecs/codecs_ld.cpp 2012-12-19 08:57:43 UTC (rev 576)
@@ -1,4 +1,4 @@
-#include "mp_config.h"
+#include "mpxp_config.h"
#include "osdep/mplib.h"
using namespace mpxp;
/*
@@ -10,9 +10,9 @@
#include <string.h>
#include <stdarg.h>
#include "codecs_ld.h"
-#include "help_mp.h"
+#include "mpxp_help.h"
#define MSGT_CLASS MSGT_GLOBAL
-#include "mp_msg.h"
+#include "mpxp_msg.h"
any_t* ld_codec(const char *name,const char *url_hint)
{
Modified: m...
[truncated message content] |
