[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[541] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[541] mplayerxp
|
From: <nic...@us...> - 2012-12-11 16:06:17
|
Revision: 541
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=541&view=rev
Author: nickols_k
Date: 2012-12-11 16:06:04 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
rename libmpstream -> libmpstream2 (TRANSACTION END)
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/dump.cpp
mplayerxp/libao2/ao_alsa9.cpp
mplayerxp/libao2/ao_null.cpp
mplayerxp/libmpcodecs/ad.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpcodecs/vd.cpp
mplayerxp/libmpcodecs/vd_libdv.cpp
mplayerxp/libmpconf/m_option.cpp
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_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_r.cpp
mplayerxp/libmpdemux/demuxer_stream.cpp
mplayerxp/libmpdemux/mux_lavf.cpp
mplayerxp/libmpdemux/mux_mpxp64.cpp
mplayerxp/libmpdemux/parse_es.cpp
mplayerxp/libmpdemux/parse_mp4.cpp
mplayerxp/libmpdemux/stheader.cpp
mplayerxp/libmpdemux/yuv4mpeg.cpp
mplayerxp/libmpstream2/Makefile
mplayerxp/libmpstream2/librtsp/rtsp.h
mplayerxp/libmpsub/vobsub.cpp
mplayerxp/libplaytree/asxparser.cpp
mplayerxp/libplaytree/playtree.cpp
mplayerxp/libplaytree/playtreeparser.cpp
mplayerxp/libvo/sub.cpp
mplayerxp/libvo/vo_fbdev.cpp
mplayerxp/mp-opt-reg.cpp
mplayerxp/mplayerxp.cpp
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/Makefile 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
TARGET_EXE = $(PROGNAME)
# these subdirectories required installation due binaries within them
-SUBDIRS = libmpdemux libmpstream libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo xmpcore
+SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo xmpcore
ifeq ($(ENABLE_WIN32LOADER),yes)
SUBDIRS+=loader
endif
@@ -32,7 +32,7 @@
../lavc/libavformat/libavformat$(LAVC_SUFFIX).a \
../lavc/libavutil/libavutil$(LAVC_SUFFIX).a
-MP_LIBS = libmpstream/libmpstream.a \
+MP_LIBS = libmpstream2/libmpstream2.a \
libmpdemux/libmpdemux.a \
libmpcodecs/libmpcodecs.a \
libmpsub/libmpsub.a \
Modified: mplayerxp/dump.cpp
===================================================================
--- mplayerxp/dump.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/dump.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -15,8 +15,8 @@
#include "input2/input.h"
#include "mplayerxp.h"
#include "libmpdemux/muxer.h"
-#include "libmpstream/stream.h"
-#include "libmpstream/mrl.h"
+#include "libmpstream2/stream.h"
+#include "libmpstream2/mrl.h"
#define MSGT_CLASS MSGT_GLOBAL
#include "mp_msg.h"
#include "dump.h"
Modified: mplayerxp/libao2/ao_alsa9.cpp
===================================================================
--- mplayerxp/libao2/ao_alsa9.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libao2/ao_alsa9.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -29,7 +29,7 @@
#include "audio_out_internal.h"
#include "afmt.h"
#include "ao_msg.h"
-#include "libmpstream/mrl.h"
+#include "libmpstream2/mrl.h"
static ao_info_t info =
{
Modified: mplayerxp/libao2/ao_null.cpp
===================================================================
--- mplayerxp/libao2/ao_null.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libao2/ao_null.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -10,7 +10,7 @@
#include "osdep/bswap.h"
-#include "libmpstream/mrl.h"
+#include "libmpstream2/mrl.h"
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
Modified: mplayerxp/libmpcodecs/ad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/ad.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <string.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "ad.h"
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include <libdv/dv.h>
#include <libdv/dv_types.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libao2/afmt.h"
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -12,7 +12,7 @@
#include "mplayerxp.h"
#include "xmpcore/xmp_core.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpconf/codec-cfg.h"
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -16,7 +16,7 @@
#include "osdep/timer.h"
#include "osdep/shmem.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/parse_es.h"
#include "libmpdemux/stheader.h"
Modified: mplayerxp/libmpcodecs/vd.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/vd.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -12,7 +12,7 @@
#include "libvo/img_format.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "vd.h"
Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -14,7 +14,7 @@
#include <libdv/dv.h>
#include <libdv/dv_types.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
Modified: mplayerxp/libmpconf/m_option.cpp
===================================================================
--- mplayerxp/libmpconf/m_option.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpconf/m_option.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -15,7 +15,7 @@
#include "cfgparser.h"
#include "m_option.h"
-#include "libmpstream/url.h"
+#include "libmpstream2/url.h"
#define MSGT_CLASS MSGT_CPLAYER
#include "mp_msg.h"
Modified: mplayerxp/libmpdemux/aviprint.cpp
===================================================================
--- mplayerxp/libmpdemux/aviprint.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/aviprint.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -6,7 +6,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "aviprint.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_ac3.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ac3.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_ac3.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -5,7 +5,7 @@
#include <stdio.h>
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_asf.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -10,7 +10,7 @@
#include "help_mp.h"
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "asf.h"
#include "demuxer.h"
#include "demuxer_internal.h"
Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_avi.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_bmp.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_dca.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dca.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_dca.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_dv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_dv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -32,7 +32,7 @@
#include <libdv/dv_types.h>
#include "demux_msg.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_film.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -21,7 +21,7 @@
#include "help_mp.h"
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_flac.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_flac.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_flac.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_fli.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -15,7 +15,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -22,7 +22,7 @@
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
#include <stdlib.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -24,7 +24,7 @@
#include "mplayerxp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -29,7 +29,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_mp3.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mp3.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_mp3.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_mpg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_mpg.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -17,7 +17,7 @@
#include "help_mp.h"
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "parse_es.h"
Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_musepack.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_musepack.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_musepack.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_nsv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_nsv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -19,7 +19,7 @@
#include <unistd.h>
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_null.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_null.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_null.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_nuv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_nuv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -18,7 +18,7 @@
#include <unistd.h>
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -18,7 +18,7 @@
#include "mplayerxp.h"
#include "osdep/bswap.h"
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_pva.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_pva.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_pva.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -31,7 +31,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -5,7 +5,7 @@
#include <stdio.h>
#include "mplayerxp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_rawvideo.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_rawvideo.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -6,7 +6,7 @@
#include <unistd.h>
#include <string.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -28,7 +28,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_realaud.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_realaud.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_realaud.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_roq.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_roq.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_roq.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -17,7 +17,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_smjpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_smjpeg.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -21,7 +21,7 @@
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_snd_au.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_snd_au.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_snd_au.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_ts.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ts.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_ts.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -32,7 +32,7 @@
#include "mplayerxp.h"
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "parse_es.h"
Modified: mplayerxp/libmpdemux/demux_ty.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ty.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_ty.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -42,7 +42,7 @@
#include "osdep/bswap.h"
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "parse_es.h"
Modified: mplayerxp/libmpdemux/demux_viv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_viv.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_viv.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -14,7 +14,7 @@
#include <string.h> /* strtok */
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_voc.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_voc.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_voc.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_vqf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_wav.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_wav.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_wav.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demux_y4m.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demux_y4m.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -17,7 +17,7 @@
#include "yuv4mpeg.h"
//#include "stream.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -23,7 +23,7 @@
#include "demux_msg.h"
#include "demuxer.h"
#include "demuxer_internal.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "stheader.h"
#include "mplayerxp.h"
Modified: mplayerxp/libmpdemux/demuxer_r.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_r.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demuxer_r.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -6,7 +6,7 @@
#define __USE_ISOC99 1 /* for lrint */
#include <math.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "demuxer_r.h"
Modified: mplayerxp/libmpdemux/demuxer_stream.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_stream.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/demuxer_stream.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -2,7 +2,7 @@
#include "osdep/mplib.h"
using namespace mpxp;
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer_stream.h"
#include "demuxer.h"
#include "demuxer_internal.h"
Modified: mplayerxp/libmpdemux/mux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/mux_lavf.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/mux_lavf.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -14,7 +14,7 @@
#include "aviheader.h"
#include "muxer.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "libavformat/avformat.h"
Modified: mplayerxp/libmpdemux/mux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/mux_mpxp64.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -24,7 +24,7 @@
#include "loader/qtx/qtxsdk/components.h"
#include "osdep/bswap.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "stheader.h"
Modified: mplayerxp/libmpdemux/parse_es.cpp
===================================================================
--- mplayerxp/libmpdemux/parse_es.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/parse_es.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -8,7 +8,7 @@
#include <unistd.h>
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "parse_es.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/parse_mp4.cpp
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/parse_mp4.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include "parse_mp4.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demux_msg.h"
int mp4_read_descr_len(Memory_Stream& s) {
Modified: mplayerxp/libmpdemux/stheader.cpp
===================================================================
--- mplayerxp/libmpdemux/stheader.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/stheader.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#include "help_mp.h"
#include "sub_cc.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "parse_es.h"
Modified: mplayerxp/libmpdemux/yuv4mpeg.cpp
===================================================================
--- mplayerxp/libmpdemux/yuv4mpeg.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpdemux/yuv4mpeg.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -32,7 +32,7 @@
#include "yuv4mpeg.h"
#include "demux_msg.h"
#include "yuv4mpeg_intern.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
/* quick test of two ratios for equality (i.e. identical components) */
#define Y4M_RATIO_EQL(a,b) ( ((a).n == (b).n) && ((a).d == (b).d) )
Modified: mplayerxp/libmpstream2/Makefile
===================================================================
--- mplayerxp/libmpstream2/Makefile 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpstream2/Makefile 2012-12-11 16:06:04 UTC (rev 541)
@@ -1,5 +1,5 @@
-LIBNAME = libmpstream.a
+LIBNAME = libmpstream2.a
include ../mp_config.mak
Modified: mplayerxp/libmpstream2/librtsp/rtsp.h
===================================================================
--- mplayerxp/libmpstream2/librtsp/rtsp.h 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpstream2/librtsp/rtsp.h 2012-12-11 16:06:04 UTC (rev 541)
@@ -31,7 +31,7 @@
#ifndef HAVE_RTSP_H
#define HAVE_RTSP_H
-#include "libmpstream/tcp.h"
+#include "libmpstream2/tcp.h"
/* some codes returned by rtsp_request_* functions */
enum {
Modified: mplayerxp/libmpsub/vobsub.cpp
===================================================================
--- mplayerxp/libmpsub/vobsub.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libmpsub/vobsub.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include "mplayerxp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "vobsub.h"
#include "spudec.h"
#define MSGT_CLASS MSGT_VOBSUB
Modified: mplayerxp/libplaytree/asxparser.cpp
===================================================================
--- mplayerxp/libplaytree/asxparser.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libplaytree/asxparser.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -8,7 +8,7 @@
#include <string.h>
#include <unistd.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "playtreeparser.h"
#include "asxparser.h"
#include "libmpconf/cfgparser.h"
Modified: mplayerxp/libplaytree/playtree.cpp
===================================================================
--- mplayerxp/libplaytree/playtree.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libplaytree/playtree.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -11,7 +11,7 @@
#ifdef MP_DEBUG
#include <assert.h>
#endif
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "playtree.h"
#define MSGT_CLASS MSGT_PLAYTREE
#include "mp_msg.h"
Modified: mplayerxp/libplaytree/playtreeparser.cpp
===================================================================
--- mplayerxp/libplaytree/playtreeparser.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libplaytree/playtreeparser.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -13,7 +13,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "asxparser.h"
#include "playtree.h"
#include "playtreeparser.h"
Modified: mplayerxp/libvo/sub.cpp
===================================================================
--- mplayerxp/libvo/sub.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libvo/sub.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -7,7 +7,7 @@
#include <string.h>
#include "mplayerxp.h"
-#include "libmpstream/stream.h" // for nav_hl
+#include "libmpstream2/stream.h" // for nav_hl
#include "xmpcore/xmp_core.h"
#include "video_out.h"
#include "font_load.h"
Modified: mplayerxp/libvo/vo_fbdev.cpp
===================================================================
--- mplayerxp/libvo/vo_fbdev.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/libvo/vo_fbdev.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -35,7 +35,7 @@
#endif
#include "aspect.h"
#include "dri_vo.h"
-#include "libmpstream/mrl.h"
+#include "libmpstream2/mrl.h"
#include "vo_msg.h"
namespace mpxp {
Modified: mplayerxp/mp-opt-reg.cpp
===================================================================
--- mplayerxp/mp-opt-reg.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/mp-opt-reg.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpconf/cfgparser.h"
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-12-11 16:00:46 UTC (rev 540)
+++ mplayerxp/mplayerxp.cpp 2012-12-11 16:06:04 UTC (rev 541)
@@ -35,7 +35,7 @@
#define HELP_MP_DEFINE_STATIC
#include "help_mp.h"
-#include "libmpstream/stream.h"
+#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
#include "libmpdemux/parse_es.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
