[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[33] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[33] mplayerxp
|
From: <nic...@us...> - 2009-12-08 13:00:55
|
Revision: 33
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=33&view=rev
Author: nickols_k
Date: 2009-12-08 13:00:44 +0000 (Tue, 08 Dec 2009)
Log Message:
-----------
minor fixes and cleanups
Modified Paths:
--------------
Makefile
mplayerxp/asxparser.c
mplayerxp/cfgparser.c
mplayerxp/codec-cfg.c
mplayerxp/cpudetect.c
mplayerxp/dump.c
mplayerxp/find_sub.c
mplayerxp/libao2/ao_alsa9.c
mplayerxp/libao2/ao_jack.c
mplayerxp/libao2/ao_nas.c
mplayerxp/libao2/ao_null.c
mplayerxp/libao2/ao_openal.c
mplayerxp/libao2/ao_oss.c
mplayerxp/libao2/ao_sdl.c
mplayerxp/libao2/ao_wav.c
mplayerxp/libmpcodecs/ad_dmo.c
mplayerxp/libmpcodecs/ad_mp3.c
mplayerxp/libmpcodecs/ad_real.c
mplayerxp/libmpcodecs/dec_audio.c
mplayerxp/libmpcodecs/dec_video.c
mplayerxp/libmpcodecs/vd_dmo.c
mplayerxp/libmpcodecs/vd_qtvideo.c
mplayerxp/libmpcodecs/vd_theora.c
mplayerxp/libmpdemux/asf_mmst_streaming.c
mplayerxp/libmpdemux/cache2.c
mplayerxp/libmpdemux/demux_asf.c
mplayerxp/libmpdemux/demux_audio.c
mplayerxp/libmpdemux/demux_avi.c
mplayerxp/libmpdemux/demux_film.c
mplayerxp/libmpdemux/demux_fli.c
mplayerxp/libmpdemux/demux_lavf.c
mplayerxp/libmpdemux/demux_mkv.c
mplayerxp/libmpdemux/demux_mov.c
mplayerxp/libmpdemux/demux_mpg.c
mplayerxp/libmpdemux/demux_mpxp64.c
mplayerxp/libmpdemux/demux_nsv.c
mplayerxp/libmpdemux/demux_nuv.c
mplayerxp/libmpdemux/demux_ogg.c
mplayerxp/libmpdemux/demux_pva.c
mplayerxp/libmpdemux/demux_ra.c
mplayerxp/libmpdemux/demux_rawvideo.c
mplayerxp/libmpdemux/demux_real.c
mplayerxp/libmpdemux/demux_roq.c
mplayerxp/libmpdemux/demux_smjpeg.c
mplayerxp/libmpdemux/demux_ts.c
mplayerxp/libmpdemux/demux_ty.c
mplayerxp/libmpdemux/demux_viv.c
mplayerxp/libmpdemux/demux_y4m.c
mplayerxp/libmpdemux/demuxer.c
mplayerxp/libmpdemux/librtsp/rtsp.c
mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
mplayerxp/libmpdemux/librtsp/rtsp_session.c
mplayerxp/libmpdemux/mux_lavf.c
mplayerxp/libmpdemux/mux_mpxp64.c
mplayerxp/libmpdemux/network.c
mplayerxp/libmpdemux/parse_mp4.c
mplayerxp/libmpdemux/realrtsp/asmrp.c
mplayerxp/libmpdemux/rtp.c
mplayerxp/libmpdemux/s_dvdnav.c
mplayerxp/libmpdemux/s_dvdplay.c
mplayerxp/libmpdemux/s_dvdread.c
mplayerxp/libmpdemux/s_ftp.c
mplayerxp/libmpdemux/s_network.c
mplayerxp/libmpdemux/s_rtsp.c
mplayerxp/libmpdemux/s_udp.c
mplayerxp/libmpdemux/s_vcd.c
mplayerxp/libmpdemux/s_vcdnav.c
mplayerxp/libmpdemux/stream.c
mplayerxp/libmpdemux/sub_ty.c
mplayerxp/libmpdemux/tcp.c
mplayerxp/libmpdemux/test.c
mplayerxp/libmpdemux/tvi_v4l.c
mplayerxp/libmpdemux/udp.c
mplayerxp/libmpdemux/url.c
mplayerxp/libmpdemux/video.c
mplayerxp/libvo/font_load.c
mplayerxp/libvo/jpeg_enc.c
mplayerxp/libvo/osd.c
mplayerxp/libvo/screenshot.c
mplayerxp/libvo/sub.c
mplayerxp/libvo/vo_null.c
mplayerxp/libvo/vo_xvidix.c
mplayerxp/libvo/vosub_vidix.c
mplayerxp/libvo/x11_common.c
mplayerxp/m_option.c
mplayerxp/m_property.c
mplayerxp/mp_image.c
mplayerxp/mp_msg.c
mplayerxp/nls/recode.c
mplayerxp/osdep/lrmi.c
mplayerxp/osdep/shmem.c
mplayerxp/osdep/vbelib.c
mplayerxp/postproc/libmenu/menu.c
mplayerxp/postproc/libmenu/menu_cmdlist.c
mplayerxp/postproc/libmenu/menu_console.c
mplayerxp/postproc/libmenu/menu_filesel.c
mplayerxp/postproc/libmenu/menu_param.c
mplayerxp/postproc/libmenu/menu_pt.c
mplayerxp/postproc/libmenu/menu_txt.c
mplayerxp/postproc/vf_1bpp.c
mplayerxp/postproc/vf_2xsai.c
mplayerxp/postproc/vf_aspect.c
mplayerxp/postproc/vf_delogo.c
mplayerxp/postproc/vf_denoise3d.c
mplayerxp/postproc/vf_dint.c
mplayerxp/postproc/vf_down3dright.c
mplayerxp/postproc/vf_eq.c
mplayerxp/postproc/vf_expand.c
mplayerxp/postproc/vf_format.c
mplayerxp/postproc/vf_framestep.c
mplayerxp/postproc/vf_il.c
mplayerxp/postproc/vf_menu.c
mplayerxp/postproc/vf_mirror.c
mplayerxp/postproc/vf_noise.c
mplayerxp/postproc/vf_ow.c
mplayerxp/postproc/vf_palette.c
mplayerxp/postproc/vf_panscan.c
mplayerxp/postproc/vf_perspective.c
mplayerxp/postproc/vf_pp.c
mplayerxp/postproc/vf_raw.c
mplayerxp/postproc/vf_rectangle.c
mplayerxp/postproc/vf_rgb2bgr.c
mplayerxp/postproc/vf_rotate.c
mplayerxp/postproc/vf_smartblur.c
mplayerxp/postproc/vf_softpulldown.c
mplayerxp/postproc/vf_swapuv.c
mplayerxp/postproc/vf_test.c
mplayerxp/postproc/vf_unsharp.c
mplayerxp/postproc/vf_vo.c
mplayerxp/postproc/vf_yuvcsp.c
mplayerxp/postproc/vf_yuy2.c
mplayerxp/postproc/vf_yvu9.c
mplayerxp/sig_hand.c
mplayerxp/spudec.c
mplayerxp/subreader.c
Modified: Makefile
===================================================================
--- Makefile 2009-12-07 19:04:38 UTC (rev 32)
+++ Makefile 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,11 +4,17 @@
all: $(SUBDIRS)
+
.PHONY: subdirs $(SUBDIRS)
+
subdirs: $(SUBDIRS)
$(SUBDIRS):
+ifeq ($(filter 3.81,$(firstword $(sort $(MAKE_VERSION) \ 3.81))),)
+$(error 'make' utility is too old. Required version is 3.81)
+@exit 1
+endif
$(MAKE) -C $@
install:
Modified: mplayerxp/asxparser.c
===================================================================
--- mplayerxp/asxparser.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/asxparser.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -8,10 +8,10 @@
#include "libmpdemux/stream.h"
#include "playtreeparser.h"
#include "asxparser.h"
+#include "cfgparser.h"
+#include "../mplayer.h"
#define MSGT_CLASS MSGT_PLAYTREE
#include "__mp_msg.h"
-#include "cfgparser.h"
-#include "../mplayer.h"
////// List utils
Modified: mplayerxp/cfgparser.c
===================================================================
--- mplayerxp/cfgparser.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/cfgparser.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -16,8 +16,6 @@
#include <string.h>
#include <errno.h>
#include "mp_config.h"
-#define MSGT_CLASS MSGT_CFGPARSER
-#include "__mp_msg.h"
#define COMMAND_LINE 0
#define CONFIG_FILE 1
@@ -39,6 +37,8 @@
#include "libmpdemux/stream.h"
#include "cfgparser.h"
+#define MSGT_CLASS MSGT_CFGPARSER
+#include "__mp_msg.h"
typedef int (*cfg_func_arg_param_t)(config_t *,const char *,const char *);
typedef int (*cfg_func_param_t)(config_t *,const char *);
Modified: mplayerxp/codec-cfg.c
===================================================================
--- mplayerxp/codec-cfg.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/codec-cfg.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -25,10 +25,10 @@
// for mmioFOURCC:
#include "wine/avifmt.h"
+#include "libvo/img_format.h"
+#include "codec-cfg.h"
#define MSGT_CLASS MSGT_CODECCFG
#include "__mp_msg.h"
-#include "libvo/img_format.h"
-#include "codec-cfg.h"
#define MAX_NR_TOKEN 16
Modified: mplayerxp/cpudetect.c
===================================================================
--- mplayerxp/cpudetect.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/cpudetect.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,8 +1,8 @@
#include "mp_config.h"
#include "cpudetect.h"
+#include "help_mp.h"
#define MSGT_CLASS MSGT_CPUDETECT
#include "__mp_msg.h"
-#include "help_mp.h"
CpuCaps gCpuCaps;
#ifdef HAVE_MALLOC
Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/dump.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -10,14 +10,14 @@
#include "mp_config.h"
#include "dump.h"
-#define MSGT_CLASS MSGT_GLOBAL
-#include "__mp_msg.h"
#include "sig_hand.h"
#include "help_mp.h"
#include "input/input.h"
#include "../mplayer.h"
#include "libmpdemux/muxer.h"
#include "libmpdemux/mrl.h"
+#define MSGT_CLASS MSGT_GLOBAL
+#include "__mp_msg.h"
static char *media=NULL,*port=NULL;
Modified: mplayerxp/find_sub.c
===================================================================
--- mplayerxp/find_sub.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/find_sub.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -8,11 +8,11 @@
#include <stdio.h>
#include <limits.h>
-#define MSGT_CLASS MSGT_FINDSUB
-#include "__mp_msg.h"
#include "libvo/video_out.h"
#include "libvo/sub.h"
#include "subreader.h"
+#define MSGT_CLASS MSGT_FINDSUB
+#include "__mp_msg.h"
static int current_sub=0;
Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_alsa9.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -26,8 +26,8 @@
#include "audio_out.h"
#include "audio_out_internal.h"
#include "afmt.h"
+#include "../libmpdemux/mrl.h"
#include "ao_msg.h"
-#include "../libmpdemux/mrl.h"
static ao_info_t info =
{
Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_jack.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -27,7 +27,6 @@
#include <unistd.h>
#include "mp_config.h"
-#include "ao_msg.h"
#include "audio_out.h"
#include "audio_out_internal.h"
@@ -36,8 +35,8 @@
#include "osdep/timer.h"
#include "../fifo.h"
-
#include <jack/jack.h>
+#include "ao_msg.h"
static const ao_info_t info =
{
Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_nas.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -54,12 +54,12 @@
#include <audio/audiolib.h>
#include "mp_config.h"
-#include "ao_msg.h"
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af_format.h"
#include "afmt.h"
+#include "ao_msg.h"
/* NAS_FRAG_SIZE must be a power-of-two value */
#define NAS_FRAG_SIZE 4096
Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_null.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -8,11 +8,11 @@
#include "mp_config.h"
#include "../bswap.h"
-#include "ao_msg.h"
#include "../libmpdemux/mrl.h"
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
+#include "ao_msg.h"
static ao_info_t info =
{
Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_openal.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -28,14 +28,13 @@
#include <AL/alc.h>
#include <AL/al.h>
-#include "ao_msg.h"
-
#include "audio_out.h"
#include "audio_out_internal.h"
#include "postproc/af_format.h"
#include "afmt.h"
#include "osdep/timer.h"
//#include "subopt-helper.h"
+#include "ao_msg.h"
static const ao_info_t info =
{
Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_oss.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -14,9 +14,9 @@
#include "../mixer.h"
#include "afmt.h"
-#include "ao_msg.h"
#include "audio_out.h"
#include "audio_out_internal.h"
+#include "ao_msg.h"
static ao_info_t info =
{
Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_sdl.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -17,8 +17,8 @@
#include "audio_out_internal.h"
#include "afmt.h"
#include <SDL/SDL.h>
+#include "../libvo/fastmemcpy.h"
#include "ao_msg.h"
-#include "../libvo/fastmemcpy.h"
static ao_info_t info =
{
Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libao2/ao_wav.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -29,8 +29,8 @@
#include "afmt.h"
#include "audio_out.h"
#include "audio_out_internal.h"
+#include "help_mp.h"
#include "ao_msg.h"
-#include "help_mp.h"
#ifdef __MINGW32__
// for GetFileType to detect pipes
Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/ad_dmo.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -6,10 +6,9 @@
#include "codecs_ld.h"
#include "mp_config.h"
-#include "mp_msg.h"
#include "help_mp.h"
-
#include "ad_internal.h"
+#include "ad_msg.h"
static const ad_info_t info =
{
Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/ad_mp3.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -66,7 +66,7 @@
static void *dll_handle;
static int load_dll(const char *libname)
{
- if(!(dll_handle=ld_codec(libname,NULL))) return 0;
+ if(!(dll_handle=ld_codec(libname,"http://www.mpg123.de"))) return 0;
mpg123_init_ptr = ld_sym(dll_handle,"mpg123_init");
mpg123_exit_ptr = ld_sym(dll_handle,"mpg123_exit");
mpg123_new_ptr = ld_sym(dll_handle,"mpg123_new");
Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/ad_real.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,8 +9,8 @@
#include <dlfcn.h>
#include "ad_internal.h"
+#include "codecs_ld.h"
#include "ad_msg.h"
-#include "codecs_ld.h"
static const ad_info_t info = {
"RealAudio decoder",
"realaud",
Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/dec_audio.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -20,9 +20,8 @@
#include "../mplayer.h"
#include "../libmpdemux/demuxer_r.h"
#include "../postproc/af.h"
-#define MSGT_CLASS MSGT_DECAUDIO
-#include "../__mp_msg.h"
#include "../libvo/fastmemcpy.h"
+#include "ad_msg.h"
#ifdef USE_FAKE_MONO
int fakemono=0;
Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/dec_video.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -25,15 +25,13 @@
#include "vd.h"
#include "dec_video.h"
-#include "vd_msg.h"
-
// ===================================================================
-
vf_cfg_t vf_cfg; // Configuration for audio filters
#include "postproc/postprocess.h"
#include "cpudetect.h"
+#include "vd_msg.h"
extern int v_bright;
extern int v_cont;
Modified: mplayerxp/libmpcodecs/vd_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/vd_dmo.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,7 +4,6 @@
#include "mp_config.h"
-#include "mp_msg.h"
#include "help_mp.h"
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
@@ -13,6 +12,7 @@
#include "codecs_ld.h"
#include "../../loader/dmo/DMO_VideoDecoder.h"
+#include "vd_msg.h"
static const vd_info_t info = {
"DMO video codecs",
Modified: mplayerxp/libmpcodecs/vd_qtvideo.c
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/vd_qtvideo.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -3,7 +3,6 @@
#include "mp_config.h"
#include "../mplayer.h"
-#include "mp_msg.h"
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
@@ -14,6 +13,7 @@
#include "../../loader/ldt_keeper.h"
#endif
#include "codecs_ld.h"
+#include "vd_msg.h"
static const vd_info_t info = {
"Quicktime Video decoder",
Modified: mplayerxp/libmpcodecs/vd_theora.c
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpcodecs/vd_theora.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -5,11 +5,11 @@
#include <dlfcn.h>
#include "mp_config.h"
-#include "vd_msg.h"
#include "help_mp.h"
#include "codecs_ld.h"
#include "vd_internal.h"
+#include "vd_msg.h"
static const vd_info_t info = {
"Theora/VP3",
Modified: mplayerxp/libmpdemux/asf_mmst_streaming.c
===================================================================
--- mplayerxp/libmpdemux/asf_mmst_streaming.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/asf_mmst_streaming.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -19,7 +19,6 @@
#include "tcp.h"
#include "url.h"
#include "asf.h"
-#include "demux_msg.h"
#include "stream.h"
#include "network.h"
@@ -43,6 +42,7 @@
#include <langinfo.h>
#endif
#endif
+#include "demux_msg.h"
extern int audio_id;
extern int video_id;
Modified: mplayerxp/libmpdemux/cache2.c
===================================================================
--- mplayerxp/libmpdemux/cache2.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/cache2.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -13,7 +13,6 @@
#include <unistd.h>
#include <pthread.h>
-#include "demux_msg.h"
#include "stream.h"
#include "../sig_hand.h"
#include "../osdep/timer.h"
@@ -22,6 +21,7 @@
#include "../help_mp.h"
#include "mpdemux.h"
#include "../mplayer.h"
+#include "demux_msg.h"
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
Modified: mplayerxp/libmpdemux/demux_asf.c
===================================================================
--- mplayerxp/libmpdemux/demux_asf.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_asf.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -5,7 +5,6 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "bswap.h"
@@ -15,6 +14,7 @@
#include "stheader.h"
#include "../libmpcodecs/dec_audio.h"
#include "aviprint.h"
+#include "demux_msg.h"
/*
* Load 16/32-bit values in little endian byte order
* from an unaligned address
Modified: mplayerxp/libmpdemux/demux_audio.c
===================================================================
--- mplayerxp/libmpdemux/demux_audio.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_audio.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,5 +1,4 @@
#include "../mp_config.h"
-#include "demux_msg.h"
#include <stdlib.h>
#include <stdio.h>
@@ -16,6 +15,7 @@
#ifdef MP_DEBUG
#include <assert.h>
#endif
+#include "demux_msg.h"
#define RAW_MP1 1
#define RAW_MP2 2
Modified: mplayerxp/libmpdemux/demux_avi.c
===================================================================
--- mplayerxp/libmpdemux/demux_avi.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_avi.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -5,7 +5,6 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -16,6 +15,7 @@
#include "aviheader.h"
#include "../libmpcodecs/dec_audio.h"
#include "aviprint.h"
+#include "demux_msg.h"
typedef struct {
Modified: mplayerxp/libmpdemux/demux_film.c
===================================================================
--- mplayerxp/libmpdemux/demux_film.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_film.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -17,13 +17,13 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "bswap.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "demux_msg.h"
// chunk types found in a FILM file
#define CHUNK_FILM mmioFOURCC('F', 'I', 'L', 'M')
Modified: mplayerxp/libmpdemux/demux_fli.c
===================================================================
--- mplayerxp/libmpdemux/demux_fli.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_fli.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,12 +11,12 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "demux_msg.h"
typedef struct _fli_frames_t {
int num_frames;
Modified: mplayerxp/libmpdemux/demux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_lavf.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -23,12 +23,12 @@
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
-#include "demux_msg.h"
#include "help_mp.h"
#ifdef HAVE_LOCAL_FFMPEG
#include "../../codecs/ffmpeg/libavformat/avformat.h"
#include "../libmpcodecs/codecs_ld.h"
+#include "demux_msg.h"
#define PROBE_BUF_SIZE 2048
Modified: mplayerxp/libmpdemux/demux_mkv.c
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_mkv.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -18,7 +18,6 @@
#include "stheader.h"
#include "matroska.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include <dlfcn.h>
@@ -32,6 +31,7 @@
#ifdef USE_QTX_CODECS
#include "../../loader/qtx/qtxsdk/components.h"
#endif
+#include "demux_msg.h"
#ifdef HAVE_ZLIB
#include <zlib.h>
Modified: mplayerxp/libmpdemux/demux_mov.c
===================================================================
--- mplayerxp/libmpdemux/demux_mov.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_mov.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -22,7 +22,6 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -35,6 +34,7 @@
#include "parse_mp4.h" // .MP4 specific stuff
#include "../../loader/qtx/qtxsdk/components.h"
+#include "demux_msg.h"
#ifdef HAVE_ZLIB
#include <zlib.h>
Modified: mplayerxp/libmpdemux/demux_mpg.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpg.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_mpg.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,7 +12,6 @@
#include "bswap.h"
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -23,6 +22,7 @@
#include "dvdauth.h"
#include "../libmpcodecs/dec_audio.h"
+#include "demux_msg.h"
//#define MAX_PS_PACKETSIZE 2048
#define MAX_PS_PACKETSIZE (224*1024)
Modified: mplayerxp/libmpdemux/demux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_mpxp64.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -10,7 +10,6 @@
#include <math.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -25,6 +24,7 @@
#include "../libmpcodecs/dec_audio.h"
#include "aviprint.h"
#include "mpxpav64.h"
+#include "demux_msg.h"
#define MAX_AV_STREAMS MAX_V_STREAMS+MAX_A_STREAMS+MAX_S_STREAMS
Modified: mplayerxp/libmpdemux/demux_nsv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nsv.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_nsv.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -16,11 +16,11 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "demux_msg.h"
typedef struct {
float v_pts;
Modified: mplayerxp/libmpdemux/demux_nuv.c
===================================================================
--- mplayerxp/libmpdemux/demux_nuv.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_nuv.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -15,12 +15,12 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "nuppelvideo.h"
+#include "demux_msg.h"
struct nuv_signature
Modified: mplayerxp/libmpdemux/demux_ogg.c
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_ogg.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,7 +9,6 @@
#include "../mplayer.h"
#include "bswap.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
@@ -21,6 +20,7 @@
#include "../libmpcodecs/codecs_ld.h"
#include "../libmpcodecs/dec_audio.h"
#include "../libvo/sub.h"
+#include "demux_msg.h"
#define BLOCK_SIZE 4096
#define FOURCC_VORBIS mmioFOURCC('v', 'r', 'b', 's')
Modified: mplayerxp/libmpdemux/demux_pva.c
===================================================================
--- mplayerxp/libmpdemux/demux_pva.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_pva.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -27,7 +27,6 @@
#include <string.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -35,6 +34,7 @@
#include "stheader.h"
#include "bswap.h"
+#include "demux_msg.h"
/*
* #defines below taken from PVA spec (see URL above)
Modified: mplayerxp/libmpdemux/demux_ra.c
===================================================================
--- mplayerxp/libmpdemux/demux_ra.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_ra.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,7 +9,6 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -17,6 +16,7 @@
#include "stheader.h"
#include "bswap.h"
#include "aviprint.h"
+#include "demux_msg.h"
#define FOURCC_DOTRA mmioFOURCC('.','r','a', 0xfd)
#define FOURCC_144 mmioFOURCC('1','4','_','4')
Modified: mplayerxp/libmpdemux/demux_rawvideo.c
===================================================================
--- mplayerxp/libmpdemux/demux_rawvideo.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_rawvideo.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -5,7 +5,6 @@
#include <unistd.h>
#include <string.h>
-#include "demux_msg.h"
#include "stream.h"
#include "demuxer.h"
@@ -13,6 +12,7 @@
#include "../cfgparser.h"
#include "../libvo/img_format.h"
+#include "demux_msg.h"
int use_rawvideo = 0;
static int format = IMGFMT_I420;
Modified: mplayerxp/libmpdemux/demux_real.c
===================================================================
--- mplayerxp/libmpdemux/demux_real.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_real.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -24,7 +24,6 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -33,6 +32,7 @@
#include "bswap.h"
#include "aviprint.h"
#include "../libmpcodecs/dec_audio.h"
+#include "demux_msg.h"
#define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24))
Modified: mplayerxp/libmpdemux/demux_roq.c
===================================================================
--- mplayerxp/libmpdemux/demux_roq.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_roq.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -13,12 +13,12 @@
#include <unistd.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "demux_msg.h"
#define RoQ_INFO 0x1001
#define RoQ_QUAD_CODEBOOK 0x1002
Modified: mplayerxp/libmpdemux/demux_smjpeg.c
===================================================================
--- mplayerxp/libmpdemux/demux_smjpeg.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_smjpeg.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -17,13 +17,13 @@
#include <string.h> /* strtok */
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "bswap.h"
+#include "demux_msg.h"
static int smjpeg_probe(demuxer_t* demuxer){
int orig_pos = stream_tell(demuxer->stream);
Modified: mplayerxp/libmpdemux/demux_ts.c
===================================================================
--- mplayerxp/libmpdemux/demux_ts.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_ts.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -29,7 +29,6 @@
#include "../mp_config.h"
#include "../mplayer.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
@@ -39,6 +38,7 @@
#include "bswap.h"
#include "mpeg_hdr.h"
+#include "demux_msg.h"
#define TS_PH_PACKET_SIZE 192
#define TS_FEC_PACKET_SIZE 204
Modified: mplayerxp/libmpdemux/demux_ty.c
===================================================================
--- mplayerxp/libmpdemux/demux_ty.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_ty.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -37,7 +37,6 @@
#include "../mp_config.h"
#include "bswap.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
@@ -45,6 +44,7 @@
#include "parse_es.h"
#include "stheader.h"
#include "sub_cc.h"
+#include "demux_msg.h"
#define AV_RB24(x) ((((uint8_t*)(x))[0] << 16) | \
Modified: mplayerxp/libmpdemux/demux_viv.c
===================================================================
--- mplayerxp/libmpdemux/demux_viv.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_viv.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,13 +11,13 @@
#include <string.h> /* strtok */
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "bswap.h"
+#include "demux_msg.h"
/* parameters ! */
static int vivo_param_version = -1;
Modified: mplayerxp/libmpdemux/demux_y4m.c
===================================================================
--- mplayerxp/libmpdemux/demux_y4m.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demux_y4m.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,7 +11,6 @@
#include <string.h> /* strtok */
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "yuv4mpeg.h"
@@ -19,6 +18,7 @@
#include "demuxer.h"
#include "stheader.h"
#include "bswap.h"
+#include "demux_msg.h"
typedef struct {
int framenum;
Modified: mplayerxp/libmpdemux/demuxer.c
===================================================================
--- mplayerxp/libmpdemux/demuxer.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/demuxer.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,7 +11,6 @@
#include "stream.h"
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "../mplayer.h"
#include "../subreader.h"
@@ -22,6 +21,7 @@
#include "stheader.h"
#include "../libvo/fastmemcpy.h"
+#include "demux_msg.h"
extern demuxer_driver_t demux_aiff;
extern demuxer_driver_t demux_rawaudio;
Modified: mplayerxp/libmpdemux/librtsp/rtsp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/librtsp/rtsp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -51,10 +51,10 @@
#include <sys/types.h>
#include <inttypes.h>
-#include "../demux_msg.h"
#include "rtsp.h"
#include "rtsp_session.h"
#include "osdep/timer.h"
+#include "../demux_msg.h"
/*
#define LOG
Modified: mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/librtsp/rtsp_rtp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -38,12 +38,12 @@
#include <ws2tcpip.h>
#endif
-#include "../demux_msg.h"
#include "rtsp.h"
#include "rtsp_rtp.h"
#include "rtsp_session.h"
#include "../freesdp/common.h"
#include "../freesdp/parser.h"
+#include "../demux_msg.h"
#define RTSP_DEFAULT_PORT 31336
#define MAX_LENGTH 256
Modified: mplayerxp/libmpdemux/librtsp/rtsp_session.c
===================================================================
--- mplayerxp/libmpdemux/librtsp/rtsp_session.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/librtsp/rtsp_session.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -44,7 +44,6 @@
#include <string.h>
#include <inttypes.h>
-#include "../demux_msg.h"
#include "../url.h"
#include "../rtp.h"
#include "rtsp.h"
@@ -54,6 +53,7 @@
#include "../realrtsp/rmff.h"
#include "../realrtsp/asmrp.h"
#include "../realrtsp/xbuffer.h"
+#include "../demux_msg.h"
/*
#define LOG
Modified: mplayerxp/libmpdemux/mux_lavf.c
===================================================================
--- mplayerxp/libmpdemux/mux_lavf.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/mux_lavf.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -6,7 +6,6 @@
#include <inttypes.h>
#include <limits.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "bswap.h"
@@ -19,6 +18,7 @@
#ifdef HAVE_LOCAL_FFMPEG
#include "../../codecs/ffmpeg/libavformat/avformat.h"
#include "../libmpcodecs/codecs_ld.h"
+#include "demux_msg.h"
extern unsigned int codec_get_wav_tag(int id);
extern enum CodecID codec_get_bmp_id(unsigned int tag);
Modified: mplayerxp/libmpdemux/mux_mpxp64.c
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/mux_mpxp64.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -28,10 +28,9 @@
#include "muxer.h"
#include "aviheader.h"
+#include "mpxpav64.h"
#include "demux_msg.h"
-#include "mpxpav64.h"
-
typedef struct priv_mpxpav64_stream_s
{
/* statistics */
Modified: mplayerxp/libmpdemux/network.c
===================================================================
--- mplayerxp/libmpdemux/network.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/network.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -41,8 +41,8 @@
#ifndef STREAMING_LIVE_DOT_COM
#include "rtp.h"
#endif
+#include "../version.h"
#include "demux_msg.h"
-#include "../version.h"
/* Variables for the command line option -user, -passwd & -bandwidth */
char *network_username=NULL;
Modified: mplayerxp/libmpdemux/parse_mp4.c
===================================================================
--- mplayerxp/libmpdemux/parse_mp4.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/parse_mp4.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,8 +12,8 @@
#endif
#include <stdlib.h>
#include "parse_mp4.h"
+#include "stream.h"
#include "demux_msg.h"
-#include "stream.h"
//#define MP4_DUMPATOM
Modified: mplayerxp/libmpdemux/realrtsp/asmrp.c
===================================================================
--- mplayerxp/libmpdemux/realrtsp/asmrp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/realrtsp/asmrp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -40,8 +40,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
+#include "asmrp.h"
#include "../demux_msg.h"
-#include "asmrp.h"
/*
#define LOG
Modified: mplayerxp/libmpdemux/rtp.c
===================================================================
--- mplayerxp/libmpdemux/rtp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/rtp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -28,8 +28,8 @@
/* MPEG-2 TS RTP stack */
#define DEBUG 1
+#include "rtp.h"
#include "demux_msg.h"
-#include "rtp.h"
// RTP reorder routines
// Also handling of repeated UDP packets (a bug of ExtremeNetworks switches firmware)
Modified: mplayerxp/libmpdemux/s_dvdnav.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdnav.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_dvdnav.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -6,13 +6,13 @@
#include <string.h>
#include <math.h>
#include "stream.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "demuxer.h"
#include "../spudec.h"
#include "../libvo/sub.h"
#include "../input/input.h"
#include "../mplayer.h"
+#include "demux_msg.h"
#ifdef USE_DVDNAV
#include <dvdnav/dvdnav.h>
Modified: mplayerxp/libmpdemux/s_dvdplay.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdplay.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_dvdplay.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,8 +9,8 @@
#include <stdlib.h>
#include <string.h>
#include "stream.h"
+#include "help_mp.h"
#include "demux_msg.h"
-#include "help_mp.h"
#ifdef USE_DVDPLAY
typedef unsigned char byte_t;
Modified: mplayerxp/libmpdemux/s_dvdread.c
===================================================================
--- mplayerxp/libmpdemux/s_dvdread.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_dvdread.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -7,8 +7,8 @@
#include <string.h>
#include <ctype.h>
#include "stream.h"
+#include "help_mp.h"
#include "demux_msg.h"
-#include "help_mp.h"
#ifdef USE_DVDREAD
Modified: mplayerxp/libmpdemux/s_ftp.c
===================================================================
--- mplayerxp/libmpdemux/s_ftp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_ftp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -15,11 +15,11 @@
#include <winsock2.h>
#endif
-#include "demux_msg.h"
#include "stream.h"
#include "help_mp.h"
#include "tcp.h"
#include "url.h"
+#include "demux_msg.h"
struct stream_priv_s {
Modified: mplayerxp/libmpdemux/s_network.c
===================================================================
--- mplayerxp/libmpdemux/s_network.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_network.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -8,8 +8,8 @@
#include <unistd.h>
#include "../mp_config.h"
#include "stream.h"
+#include "help_mp.h"
#include "demux_msg.h"
-#include "help_mp.h"
#ifdef HAVE_STREAMING
Modified: mplayerxp/libmpdemux/s_rtsp.c
===================================================================
--- mplayerxp/libmpdemux/s_rtsp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_rtsp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -15,13 +15,13 @@
#include <winsock2.h>
#endif
-#include "demux_msg.h"
#include "stream.h"
#include "help_mp.h"
#include "url.h"
#include "tcp.h"
#include "librtsp/rtsp.h"
#include "librtsp/rtsp_session.h"
+#include "demux_msg.h"
#define RTSP_DEFAULT_PORT 554
Modified: mplayerxp/libmpdemux/s_udp.c
===================================================================
--- mplayerxp/libmpdemux/s_udp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_udp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -15,11 +15,11 @@
#include <winsock2.h>
#endif
-#include "demux_msg.h"
#include "stream.h"
#include "help_mp.h"
#include "udp.h"
#include "url.h"
+#include "demux_msg.h"
static int __FASTCALL__ udp_read(stream_t *s,stream_packet_t*sp)
{
Modified: mplayerxp/libmpdemux/s_vcd.c
===================================================================
--- mplayerxp/libmpdemux/s_vcd.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_vcd.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -6,7 +6,6 @@
#include <string.h>
#include <stdio.h>
#include "stream.h"
-#include "demux_msg.h"
#ifdef HAVE_VCD
@@ -27,6 +26,7 @@
#endif
#include "help_mp.h"
#include "mrl.h"
+#include "demux_msg.h"
typedef struct vcd_priv_s
{
Modified: mplayerxp/libmpdemux/s_vcdnav.c
===================================================================
--- mplayerxp/libmpdemux/s_vcdnav.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/s_vcdnav.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,8 +11,8 @@
#ifdef USE_LIBVCD
#include <libvcd/info.h>
#include <libvcd/logging.h>
+#include "mrl.h"
#include "help_mp.h"
-#include "mrl.h"
typedef struct {
uint8_t subheader [CDIO_CD_SUBHEADER_SIZE];
Modified: mplayerxp/libmpdemux/stream.c
===================================================================
--- mplayerxp/libmpdemux/stream.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/stream.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,11 +12,11 @@
#include "../mp_config.h"
#include "../mplayer.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "stream.h"
#include "demuxer.h"
+#include "demux_msg.h"
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
Modified: mplayerxp/libmpdemux/sub_ty.c
===================================================================
--- mplayerxp/libmpdemux/sub_ty.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/sub_ty.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -14,11 +14,11 @@
#include <string.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "sub_cc.h"
#include "../libvo/sub.h"
+#include "demux_msg.h"
extern int sub_justify;
Modified: mplayerxp/libmpdemux/tcp.c
===================================================================
--- mplayerxp/libmpdemux/tcp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/tcp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -17,7 +17,6 @@
#include "../mp_config.h"
-#include "demux_msg.h"
#include "help_mp.h"
#include "../input/input.h"
@@ -33,6 +32,7 @@
#endif
#include "tcp.h"
+#include "demux_msg.h"
/* IPv6 options */
extern int network_prefer_ipv4;
Modified: mplayerxp/libmpdemux/test.c
===================================================================
--- mplayerxp/libmpdemux/test.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/test.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,11 +4,11 @@
#include <string.h>
#include "../mp_config.h"
-#include "demux_msg.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
+#include "demux_msg.h"
//--------------------------
Modified: mplayerxp/libmpdemux/tvi_v4l.c
===================================================================
--- mplayerxp/libmpdemux/tvi_v4l.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/tvi_v4l.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -27,13 +27,13 @@
#include <stdlib.h>
#include <string.h>
-#include "demux_msg.h"
#include "../libao2/afmt.h"
#include "../libao2/audio_out.h"
#include "../libvo/img_format.h"
#include "../libvo/fastmemcpy.h"
#include "tv.h"
+#include "demux_msg.h"
static tvi_info_t info = {
"Video 4 Linux input",
Modified: mplayerxp/libmpdemux/udp.c
===================================================================
--- mplayerxp/libmpdemux/udp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/udp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -39,9 +39,9 @@
#include <ws2tcpip.h>
#endif
-#include "demux_msg.h"
#include "url.h"
#include "udp.h"
+#include "demux_msg.h"
int reuse_socket=0;
Modified: mplayerxp/libmpdemux/url.c
===================================================================
--- mplayerxp/libmpdemux/url.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/url.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,8 +12,8 @@
#include <inttypes.h>
#include "url.h"
+#include "help_mp.h"
#include "demux_msg.h"
-#include "help_mp.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
Modified: mplayerxp/libmpdemux/video.c
===================================================================
--- mplayerxp/libmpdemux/video.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libmpdemux/video.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,7 +9,6 @@
#include <string.h>
#include <unistd.h>
-#include "demux_msg.h"
#include "help_mp.h"
#include "sub_cc.h"
@@ -19,6 +18,7 @@
#include "parse_es.h"
#include "mpeg_hdr.h"
#include "../mplayer.h"
+#include "demux_msg.h"
/* biCompression constant */
#define BI_RGB 0L
Modified: mplayerxp/libvo/font_load.c
===================================================================
--- mplayerxp/libvo/font_load.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/font_load.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -5,11 +5,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
-#include "vo_msg.h"
#include "../mp_config.h"
#include "font_load.h"
#include "sub.h"
#include "../osdep/get_path.h"
+#include "vo_msg.h"
raw_file* load_raw(char *name,int verbose){
int bpp;
Modified: mplayerxp/libvo/jpeg_enc.c
===================================================================
--- mplayerxp/libvo/jpeg_enc.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/jpeg_enc.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -31,7 +31,6 @@
#ifdef USE_FASTMEMCPY
#include "fastmemcpy.h"
#endif
-#include "vo_msg.h"
/* We need this #define because we need ../libavcodec/common.h to #define
* be2me_32, otherwise the linker will complain that it doesn't exist */
#define HAVE_AV_CONFIG_H
@@ -40,6 +39,7 @@
//#include "../libavcodec/mpegvideo.h"
#include "jpeg_enc.h"
+#include "vo_msg.h"
/* zr_mjpeg_encode_mb needs access to these tables for the black & white
* option */
Modified: mplayerxp/libvo/osd.c
===================================================================
--- mplayerxp/libvo/osd.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/osd.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,9 +12,9 @@
#include <inttypes.h>
#include "../cpudetect.h"
#include "../mangle.h"
-#include "vo_msg.h"
#include "../mplayer.h"
#include "osd.h"
+#include "vo_msg.h"
#if defined(__MMX__)
static const uint64_t bFF __attribute__((used)) __attribute__((aligned(8))) = 0xFFFFFFFFFFFFFFFFULL;
Modified: mplayerxp/libvo/screenshot.c
===================================================================
--- mplayerxp/libvo/screenshot.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/screenshot.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -25,9 +25,9 @@
#include "screenshot.h"
#include "img_format.h"
-#include "vo_msg.h"
#include "../postproc/swscale.h"
#include "../postproc/vf_scale.h"
+#include "vo_msg.h"
#define RGB 0
#define BGR 1
Modified: mplayerxp/libvo/sub.c
===================================================================
--- mplayerxp/libvo/sub.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/sub.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -8,8 +8,6 @@
#endif
#include "../mplayer.h"
-#define MSGT_CLASS MSGT_OSD
-#include "../__mp_msg.h"
#include "video_out.h"
#include "font_load.h"
#include "sub.h"
@@ -17,6 +15,8 @@
#include "../spudec.h"
#include "../vobsub.h"
#include "../libmpdemux/stream.h"
+#define MSGT_CLASS MSGT_OSD
+#include "../__mp_msg.h"
#define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */
char * __sub_osd_names[]={
Modified: mplayerxp/libvo/vo_null.c
===================================================================
--- mplayerxp/libvo/vo_null.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/vo_null.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -34,10 +34,10 @@
#include "video_out.h"
#include "video_out_internal.h"
#include "dri_vo.h"
-#include "vo_msg.h"
#ifdef CONFIG_VIDIX
#include <vidix/vidixlib.h>
#endif
+#include "vo_msg.h"
LIBVO_EXTERN(null)
Modified: mplayerxp/libvo/vo_xvidix.c
===================================================================
--- mplayerxp/libvo/vo_xvidix.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/vo_xvidix.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -30,10 +30,10 @@
#include "x11_common.h"
#include "aspect.h"
-#include "vo_msg.h"
#include "vosub_vidix.h"
#include <vidix/vidixlib.h>
+#include "vo_msg.h"
LIBVO_EXTERN(xvidix)
Modified: mplayerxp/libvo/vosub_vidix.c
===================================================================
--- mplayerxp/libvo/vosub_vidix.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/vosub_vidix.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -30,13 +30,13 @@
#include "video_out.h"
#include "vosub_vidix.h"
-#include "vo_msg.h"
#include "fastmemcpy.h"
#include "osd.h"
#include "sub.h"
#include "video_out.h"
#include "dri_vo.h"
#include "../mp_image.h"
+#include "vo_msg.h"
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
Modified: mplayerxp/libvo/x11_common.c
===================================================================
--- mplayerxp/libvo/x11_common.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/libvo/x11_common.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -11,7 +11,6 @@
#include <sys/mman.h>
#include "video_out.h"
-#include "vo_msg.h"
#include "x11_common.h"
#include <X11/Xmd.h>
#include <X11/Xlib.h>
@@ -33,6 +32,7 @@
#include "../input/input.h"
#include "../input/mouse.h"
+#include "vo_msg.h"
/*
* If SCAN_VISUALS is defined, vo_x11_init() scans all available TrueColor
Modified: mplayerxp/m_option.c
===================================================================
--- mplayerxp/m_option.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/m_option.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -15,9 +15,9 @@
#include "libmpdemux/stream.h"
#include "cfgparser.h"
#include "m_option.h"
+#include "libmpdemux/url.h"
#define MSGT_CLASS MSGT_CPLAYER
#include "__mp_msg.h"
-#include "libmpdemux/url.h"
// Don't free for 'production' atm
#ifndef MP_DEBUG
Modified: mplayerxp/m_property.c
===================================================================
--- mplayerxp/m_property.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/m_property.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -12,9 +12,9 @@
#include "m_option.h"
#include "m_property.h"
+#include "help_mp.h"
#define MSGT_CLASS MSGT_CPLAYER
#include "__mp_msg.h"
-#include "help_mp.h"
#define ROUND(x) ((int)((x)<0 ? (x)-0.5 : (x)+0.5))
Modified: mplayerxp/mp_image.c
===================================================================
--- mplayerxp/mp_image.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/mp_image.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -9,11 +9,11 @@
#include <malloc.h>
#endif
-#define MSGT_CLASS MSGT_CPLAYER
-#include "__mp_msg.h"
#include "libvo/img_format.h"
#include "mp_image.h"
#include "libvo/fastmemcpy.h"
+#define MSGT_CLASS MSGT_CPLAYER
+#include "__mp_msg.h"
void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){
mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED);
Modified: mplayerxp/mp_msg.c
===================================================================
--- mplayerxp/mp_msg.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/mp_msg.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -6,8 +6,8 @@
#include <inttypes.h>
#include <pthread.h>
#include "mp_config.h"
+#include "nls/nls.h"
#include "mp_msg.h"
-#include "nls/nls.h"
#define _bg(x) ((x) >> 4)
#define _fg(x) ((x) & 0x0f)
Modified: mplayerxp/nls/recode.c
===================================================================
--- mplayerxp/nls/recode.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/nls/recode.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -10,8 +10,8 @@
#include <iconv.h>
#endif
#endif
+#include "./nls.h"
#include "nls_msg.h"
-#include "./nls.h"
/*
*We have to proceed with the POSIX methods of looking to `LANG'.
Modified: mplayerxp/osdep/lrmi.c
===================================================================
--- mplayerxp/osdep/lrmi.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/osdep/lrmi.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -25,9 +25,9 @@
#include <sys/mman.h>
#include <unistd.h>
#include <fcntl.h>
-#include "osdep_msg.h"
#include "lrmi.h"
#include "../cpudetect.h"
+#include "osdep_msg.h"
#define REAL_MEM_BASE ((void *)0x10000)
#define REAL_MEM_SIZE 0x10000
Modified: mplayerxp/osdep/shmem.c
===================================================================
--- mplayerxp/osdep/shmem.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/osdep/shmem.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -20,8 +20,6 @@
#include <sys/socket.h>
#include <fcntl.h>
-#include "osdep_msg.h"
-
#ifdef AIX
#include <sys/select.h>
#endif
@@ -32,6 +30,7 @@
#endif
#include "../help_mp.h"
+#include "osdep_msg.h"
#if defined(MAP_ANONYMOUS) && !defined(MAP_ANON)
#define MAP_ANON MAP_ANONYMOUS
Modified: mplayerxp/osdep/vbelib.c
===================================================================
--- mplayerxp/osdep/vbelib.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/osdep/vbelib.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -19,9 +19,9 @@
#include <ctype.h>
#include <unistd.h>
#include <fcntl.h>
-#include "osdep_msg.h"
#include "../mplayer.h"
#include "../cpudetect.h"
+#include "osdep_msg.h"
static struct VesaProtModeInterface vbe_pm_info;
Modified: mplayerxp/postproc/libmenu/menu.c
===================================================================
--- mplayerxp/postproc/libmenu/menu.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,6 +1,5 @@
#include "../../mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include <stdlib.h>
@@ -22,6 +21,7 @@
#include "m_option.h"
#include "m_struct.h"
#include "menu.h"
+#include "../pp_msg.h"
extern menu_info_t menu_info_cmdlist;
extern menu_info_t menu_info_pt;
Modified: mplayerxp/postproc/libmenu/menu_cmdlist.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_cmdlist.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_cmdlist.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,6 +1,5 @@
#include "mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include <stdlib.h>
@@ -22,9 +21,8 @@
#include "input/input.h"
#include "version.h"
+#include "../pp_msg.h"
-
-
struct list_entry_s {
struct list_entry p;
Modified: mplayerxp/postproc/libmenu/menu_console.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_console.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_console.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,6 +1,5 @@
#include "mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include <stdlib.h>
@@ -28,6 +27,7 @@
#include "osdep/keycodes.h"
#include "input/input.h"
#include "osdep/timer.h"
+#include "../pp_msg.h"
typedef struct history_st history_t;
Modified: mplayerxp/postproc/libmenu/menu_filesel.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_filesel.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_filesel.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -13,7 +13,6 @@
#include "mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include "libmpdemux/stream.h"
@@ -28,6 +27,7 @@
#include "menu_list.h"
#include "input/input.h"
#include "osdep/keycodes.h"
+#include "../pp_msg.h"
#define MENU_KEEP_PATH "/tmp/mp_current_path"
Modified: mplayerxp/postproc/libmenu/menu_param.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_param.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_param.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -10,7 +10,6 @@
#include <sys/stat.h>
#include <ctype.h>
-#include "../pp_msg.h"
#include "help_mp.h"
#include "libmpdemux/stream.h"
@@ -28,6 +27,7 @@
#include "input/input.h"
#include "osdep/keycodes.h"
//#include "command.h"
+#include "../pp_msg.h"
struct list_entry_s {
struct list_entry p;
Modified: mplayerxp/postproc/libmenu/menu_pt.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_pt.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_pt.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,7 +4,6 @@
#include <string.h>
#include "mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include "libvo/img_format.h"
@@ -18,6 +17,7 @@
#include "libmpdemux/stream.h"
#include "playtree.h"
#include "input/input.h"
+#include "../pp_msg.h"
#define mp_basename(s) (strrchr((s),'/')==NULL?(char*)(s):(strrchr((s),'/')+1))
Modified: mplayerxp/postproc/libmenu/menu_txt.c
===================================================================
--- mplayerxp/postproc/libmenu/menu_txt.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/libmenu/menu_txt.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -1,6 +1,5 @@
#include "mp_config.h"
-#include "../pp_msg.h"
#include "help_mp.h"
#include <stdlib.h>
@@ -19,6 +18,7 @@
#include "libvo/font_load.h"
#include "osdep/keycodes.h"
+#include "../pp_msg.h"
struct menu_priv_s {
char** lines;
Modified: mplayerxp/postproc/vf_1bpp.c
===================================================================
--- mplayerxp/postproc/vf_1bpp.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_1bpp.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,13 +4,13 @@
#include <inttypes.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#include "../libvo/img_format.h"
#include "mp_image.h"
#include "vf.h"
#include "../postproc/swscale.h"
+#include "pp_msg.h"
//===========================================================================//
Modified: mplayerxp/postproc/vf_2xsai.c
===================================================================
--- mplayerxp/postproc/vf_2xsai.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_2xsai.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,11 +4,11 @@
#include <inttypes.h>
#include "mp_config.h"
-#include "pp_msg.h"
#include "../libvo/img_format.h"
#include "../mp_image.h"
#include "vf.h"
+#include "pp_msg.h"
//===========================================================================//
Modified: mplayerxp/postproc/vf_aspect.c
===================================================================
--- mplayerxp/postproc/vf_aspect.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_aspect.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,11 +4,11 @@
#include <inttypes.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#include "../libvo/img_format.h"
#include "mp_image.h"
#include "vf.h"
+#include "pp_msg.h"
struct vf_priv_s {
int w, h;
Modified: mplayerxp/postproc/vf_delogo.c
===================================================================
--- mplayerxp/postproc/vf_delogo.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_delogo.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -25,7 +25,6 @@
#include <math.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#include "../cpudetect.h"
#ifdef HAVE_MALLOC
@@ -36,6 +35,7 @@
#include "mp_image.h"
#include "vf.h"
#include "../libvo/fastmemcpy.h"
+#include "pp_msg.h"
//===========================================================================//
Modified: mplayerxp/postproc/vf_denoise3d.c
===================================================================
--- mplayerxp/postproc/vf_denoise3d.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_denoise3d.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -23,7 +23,6 @@
#include <math.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#ifdef HAVE_MALLOC
#include <malloc.h>
@@ -33,6 +32,7 @@
#include "mp_image.h"
#include "vf.h"
#include "../libvo/fastmemcpy.h"
+#include "pp_msg.h"
#define PARAM1_DEFAULT 4.0
#define PARAM2_DEFAULT 3.0
Modified: mplayerxp/postproc/vf_dint.c
===================================================================
--- mplayerxp/postproc/vf_dint.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_dint.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,12 +4,12 @@
#include <inttypes.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#include "../libvo/fastmemcpy.h"
#include "mp_image.h"
#include "../libvo/img_format.h"
#include "vf.h"
+#include "pp_msg.h"
struct vf_priv_s {
float sense; // first parameter
Modified: mplayerxp/postproc/vf_down3dright.c
===================================================================
--- mplayerxp/postproc/vf_down3dright.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_down3dright.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -4,7 +4,6 @@
#include <inttypes.h>
#include "../mp_config.h"
-#include "pp_msg.h"
#include "../cpudetect.h"
#include "../libvo/img_format.h"
@@ -13,6 +12,7 @@
#include "../libvo/fastmemcpy.h"
#include "../postproc/swscale.h"
+#include "pp_msg.h"
struct vf_priv_s {
int skipline;
Modified: mplayerxp/postproc/vf_eq.c
===================================================================
--- mplayerxp/postproc/vf_eq.c 2009-12-07 19:04:38 UTC (rev 32)
+++ mplayerxp/postproc/vf_eq.c 2009-12-08 13:00:44 UTC (rev 33)
@@ -16,7 +16,6 @@
#include <inttypes.h>
#include "mp_config.h"
-#include "pp_msg.h"
#include "cpudetect.h"
#include "../libvo/img_format.h"
@@ -27,6 +26,7 @@
#ifdef USE_SETLOCALE
#include <locale.h>
#endif
+#include "pp_msg.h"
...
[truncated message content] |
