Mercurial > mplayer.hg

changeset 34174:a93891202051

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add missing mp_msg.h #includes, remove some unnecessary ones.
author diego
date Wed, 26 Oct 2011 15:12:35 +0000
parents a5d8b198c214
children a345e7162d0a
files command.c gui/ui/main.c libaf/af.c libaf/af.h libaf/af_bs2b.c libaf/af_center.c libaf/af_channels.c libaf/af_delay.c libaf/af_dummy.c libaf/af_equalizer.c libaf/af_export.c libaf/af_format.c libaf/af_hrtf.c libaf/af_ladspa.c libaf/af_lavcac3enc.c libaf/af_pan.c libaf/af_resample.c libaf/af_scaletempo.c libaf/af_sinesuppress.c libaf/af_stats.c libaf/af_sub.c libaf/af_surround.c libaf/af_volume.c libmenu/menu_dvbin.c libmpcodecs/ad_dk3adpcm.c libmpcodecs/ad_faad.c libmpcodecs/ad_libmad.c libmpcodecs/ad_libvorbis.c libmpcodecs/ad_mpc.c libmpcodecs/ad_mpg123.c libmpcodecs/ad_msadpcm.c libmpcodecs/ad_realaud.c libmpcodecs/ad_speex.c libmpcodecs/ad_twin.c libmpcodecs/mp_image.c libmpcodecs/mp_image.h libmpcodecs/vf_lavfi.c libmpdemux/aviprint.c libmpdemux/demux_nemesi.c libmpdemux/demux_rawvideo.c libmpdemux/demux_vqf.c libmpdemux/extension.c libvo/gl_common.c libvo/gl_common.h libvo/vo_xmga.c mixer.c stream/pnm.c stream/stream_bd.c stream/stream_dvb.c stream/stream_live555.c stream/stream_nemesi.c stream/stream_rtp.c stream/stream_udp.c sub/av_sub.c
diffstat 54 files changed, 61 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/command.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/command.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,6 +28,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 #include "codec-cfg.h"
+#include "mp_msg.h"
 #include "mplayer.h"
 #include "sub/sub.h"
 #include "m_option.h"
--- a/gui/ui/main.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/gui/ui/main.c	Wed Oct 26 15:12:35 2011 +0000
@@ -36,6 +36,7 @@
 #include "gui/wm/ws.h"
 
 #include "help_mp.h"
+#include "mp_msg.h"
 #include "libvo/x11_common.h"
 #include "libvo/fastmemcpy.h"
 #include "libvo/wskeys.h"
--- a/libaf/af.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af.c	Wed Oct 26 15:12:35 2011 +0000
@@ -20,9 +20,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "osdep/strsep.h"
 #include "libmpcodecs/dec_audio.h"
-
+#include "mp_msg.h"
 #include "af.h"
 
 // Static list of filters
--- a/libaf/af.h	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af.h	Wed Oct 26 15:12:35 2011 +0000
@@ -26,7 +26,6 @@
 #include "af_format.h"
 #include "control.h"
 #include "cpudetect.h"
-#include "mp_msg.h"
 
 struct af_instance_s;
 
--- a/libaf/af_bs2b.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_bs2b.c	Wed Oct 26 15:12:35 2011 +0000
@@ -26,8 +26,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
+#include "subopt-helper.h"
 #include "af.h"
-#include "subopt-helper.h"
 
 /// Internal specific data of the filter
 struct af_bs2b {
--- a/libaf/af_center.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_center.c	Wed Oct 26 15:12:35 2011 +0000
@@ -29,6 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 // Data for specific instances of this filter
--- a/libaf/af_channels.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_channels.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <inttypes.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 #define FR 0
--- a/libaf/af_delay.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_delay.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include <string.h>
 #include <inttypes.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 #define L 65536
--- a/libaf/af_dummy.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_dummy.c	Wed Oct 26 15:12:35 2011 +0000
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 // Initialization and runtime control
--- a/libaf/af_equalizer.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_equalizer.c	Wed Oct 26 15:12:35 2011 +0000
@@ -29,6 +29,7 @@
 #include <inttypes.h>
 #include <math.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 #define L   	2      // Storage for filter taps
--- a/libaf/af_export.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_export.c	Wed Oct 26 15:12:35 2011 +0000
@@ -37,8 +37,9 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "mp_msg.h"
+#include "path.h"
 #include "af.h"
-#include "path.h"
 
 #define DEF_SZ 512 // default buffer size (in samples)
 #define SHARED_FILE "mplayer-af_export" /* default file name
--- a/libaf/af_format.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_format.c	Wed Oct 26 15:12:35 2011 +0000
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include "af.h"
+#include "mp_msg.h"
 #include "mpbswap.h"
 #include "libvo/fastmemcpy.h"
 
--- a/libaf/af_hrtf.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_hrtf.c	Wed Oct 26 15:12:35 2011 +0000
@@ -27,6 +27,7 @@
 
 #include <math.h>
 
+#include "mp_msg.h"
 #include "af.h"
 #include "dsp.h"
 
--- a/libaf/af_ladspa.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_ladspa.c	Wed Oct 26 15:12:35 2011 +0000
@@ -40,8 +40,9 @@
 
 /* Local Includes */
 
+#include "help_mp.h"
+#include "mp_msg.h"
 #include "af.h"
-#include "help_mp.h"
 
 /* ------------------------------------------------------------------------- */
 
--- a/libaf/af_lavcac3enc.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_lavcac3enc.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,6 +28,7 @@
 #include "config.h"
 #include "af.h"
 #include "help_mp.h"
+#include "mp_msg.h"
 #include "reorder_ch.h"
 #include "av_helpers.h"
 
--- a/libaf/af_pan.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_pan.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 // Data for specific instances of this filter
--- a/libaf/af_resample.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_resample.c	Wed Oct 26 15:12:35 2011 +0000
@@ -26,6 +26,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/mathematics.h"
+#include "mp_msg.h"
 #include "af.h"
 #include "dsp.h"
 
--- a/libaf/af_scaletempo.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_scaletempo.c	Wed Oct 26 15:12:35 2011 +0000
@@ -37,6 +37,7 @@
 
 #include "af.h"
 #include "libavutil/common.h"
+#include "mp_msg.h"
 #include "subopt-helper.h"
 #include "help_mp.h"
 
--- a/libaf/af_sinesuppress.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_sinesuppress.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,6 +28,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 // Data for specific instances of this filter
--- a/libaf/af_stats.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_stats.c	Wed Oct 26 15:12:35 2011 +0000
@@ -23,6 +23,7 @@
 #include <inttypes.h>
 #include <math.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 #define MAX_DB  80
--- a/libaf/af_sub.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_sub.c	Wed Oct 26 15:12:35 2011 +0000
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "af.h"
 #include "dsp.h"
 
--- a/libaf/af_surround.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_surround.c	Wed Oct 26 15:12:35 2011 +0000
@@ -39,6 +39,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "af.h"
 #include "dsp.h"
 
--- a/libaf/af_volume.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libaf/af_volume.c	Wed Oct 26 15:12:35 2011 +0000
@@ -42,6 +42,7 @@
 #include <math.h>
 #include <limits.h>
 
+#include "mp_msg.h"
 #include "af.h"
 
 // Data for specific instances of this filter
--- a/libmenu/menu_dvbin.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmenu/menu_dvbin.c	Wed Oct 26 15:12:35 2011 +0000
@@ -32,6 +32,7 @@
 
 #include "m_struct.h"
 #include "m_option.h"
+#include "mp_msg.h"
 
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/mp_image.h"
--- a/libmpcodecs/ad_dk3adpcm.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_dk3adpcm.c	Wed Oct 26 15:12:35 2011 +0000
@@ -33,6 +33,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "libavutil/intreadwrite.h"
 #include "ad_internal.h"
 
--- a/libmpcodecs/ad_faad.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_faad.c	Wed Oct 26 15:12:35 2011 +0000
@@ -26,6 +26,7 @@
 #include <faad.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "ad_internal.h"
 #include "dec_audio.h"
 #include "libaf/reorder_ch.h"
--- a/libmpcodecs/ad_libmad.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_libmad.c	Wed Oct 26 15:12:35 2011 +0000
@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "config.h"
-
+#include "mp_msg.h"
 #include "ad_internal.h"
 
 static const ad_info_t info = {
--- a/libmpcodecs/ad_libvorbis.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_libvorbis.c	Wed Oct 26 15:12:35 2011 +0000
@@ -23,6 +23,7 @@
 #include <math.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "ad_internal.h"
 #include "libaf/reorder_ch.h"
 
--- a/libmpcodecs/ad_mpc.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_mpc.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "ad_internal.h"
 #include "libaf/af_format.h"
 #include "libvo/fastmemcpy.h"
--- a/libmpcodecs/ad_mpg123.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_mpg123.c	Wed Oct 26 15:12:35 2011 +0000
@@ -23,7 +23,7 @@
 #include <unistd.h>
 
 #include "config.h"
-
+#include "mp_msg.h"
 #include "ad_internal.h"
 #include "dec_audio.h"
 
--- a/libmpcodecs/ad_msadpcm.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_msadpcm.c	Wed Oct 26 15:12:35 2011 +0000
@@ -29,6 +29,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "mp_msg.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "mpbswap.h"
--- a/libmpcodecs/ad_realaud.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_realaud.c	Wed Oct 26 15:12:35 2011 +0000
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "mp_msg.h"
 
 //#include <stddef.h>
 #ifdef HAVE_LIBDL
--- a/libmpcodecs/ad_speex.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_speex.c	Wed Oct 26 15:12:35 2011 +0000
@@ -21,11 +21,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "config.h"
 #include <stdlib.h>
 #include <speex/speex.h>
 #include <speex/speex_stereo.h>
 #include <speex/speex_header.h>
+
+#include "config.h"
+#include "mp_msg.h"
 #include "ad_internal.h"
 
 static const ad_info_t info = {
--- a/libmpcodecs/ad_twin.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/ad_twin.c	Wed Oct 26 15:12:35 2011 +0000
@@ -19,8 +19,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+
 #include "config.h"
-
+#include "mp_msg.h"
 #include "ad_internal.h"
 #include "vqf.h"
 #include "libmpdemux/aviprint.h"
--- a/libmpcodecs/mp_image.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/mp_image.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,9 +28,9 @@
 
 #include "libmpcodecs/img_format.h"
 #include "libmpcodecs/mp_image.h"
-
 #include "libvo/fastmemcpy.h"
 #include "libavutil/mem.h"
+#include "mp_msg.h"
 
 void mp_image_alloc_planes(mp_image_t *mpi) {
   // IF09 - allocate space for 4. plane delta info - unused
--- a/libmpcodecs/mp_image.h	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/mp_image.h	Wed Oct 26 15:12:35 2011 +0000
@@ -22,7 +22,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "mp_msg.h"
 
 //--------- codec's requirements (filled by the codec/vf) ---------
 
--- a/libmpcodecs/vf_lavfi.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpcodecs/vf_lavfi.c	Wed Oct 26 15:12:35 2011 +0000
@@ -21,6 +21,7 @@
 #include "vf.h"
 #include "m_struct.h"
 #include "fmt-conversion.h"
+#include "mp_msg.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/avfiltergraph.h"
 #include "libavutil/pixdesc.h"
--- a/libmpdemux/aviprint.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpdemux/aviprint.c	Wed Oct 26 15:12:35 2011 +0000
@@ -22,8 +22,7 @@
 #include <inttypes.h>
 
 #include "config.h"
-
-// for avi_stream_id():
+#include "mp_msg.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 
--- a/libmpdemux/demux_nemesi.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpdemux/demux_nemesi.c	Wed Oct 26 15:12:35 2011 +0000
@@ -17,10 +17,13 @@
  * with MPlayer; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
+
 #include <stdlib.h>
 #include <stdio.h>
+
 #include "stream/stream.h"
 #include "mpcommon.h"
+#include "mp_msg.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "nemesi/rtsp.h"
--- a/libmpdemux/demux_rawvideo.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpdemux/demux_rawvideo.c	Wed Oct 26 15:12:35 2011 +0000
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "m_option.h"
-
+#include "mp_msg.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 #include "stheader.h"
--- a/libmpdemux/demux_vqf.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpdemux/demux_vqf.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include "mpbswap.h"
 
 #include "stream/stream.h"
+#include "mp_msg.h"
 #include "demuxer.h"
 #include "stheader.h"
 #include "libmpcodecs/vqf.h"
--- a/libmpdemux/extension.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libmpdemux/extension.c	Wed Oct 26 15:12:35 2011 +0000
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include "config.h"
-
+#include "mp_msg.h"
 #include "stream/stream.h"
 #include "demuxer.h"
 
--- a/libvo/gl_common.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libvo/gl_common.c	Wed Oct 26 15:12:35 2011 +0000
@@ -37,6 +37,8 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>
+
+#include "mp_msg.h"
 #include "gl_common.h"
 #include "csputils.h"
 #include "aspect.h"
--- a/libvo/gl_common.h	Wed Oct 26 15:12:25 2011 +0000
+++ b/libvo/gl_common.h	Wed Oct 26 15:12:35 2011 +0000
@@ -28,8 +28,6 @@
 #include <stdint.h>
 
 #include "config.h"
-#include "mp_msg.h"
-
 #include "video_out.h"
 #include "csputils.h"
 
--- a/libvo/vo_xmga.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/libvo/vo_xmga.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "config.h"
-
+#include "mp_msg.h"
 #include "video_out.h"
 #include "video_out_internal.h"
 
--- a/mixer.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/mixer.c	Wed Oct 26 15:12:35 2011 +0000
@@ -28,7 +28,7 @@
 #include "libao2/audio_out.h"
 #include "libaf/af.h"
 #include "mixer.h"
-
+#include "mp_msg.h"
 #include "help_mp.h"
 
 char * mixer_device=NULL;
--- a/stream/pnm.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/pnm.c	Wed Oct 26 15:12:35 2011 +0000
@@ -44,7 +44,7 @@
 #endif
 
 #include "libavutil/intreadwrite.h"
-
+#include "mp_msg.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
 #include "help_mp.h"
--- a/stream/stream_bd.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_bd.c	Wed Oct 26 15:12:35 2011 +0000
@@ -29,6 +29,7 @@
 #include "libavutil/intreadwrite.h"
 #include "m_struct.h"
 #include "m_option.h"
+#include "mp_msg.h"
 #include "stream.h"
 #include "stream_bd.h"
 
--- a/stream/stream_dvb.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_dvb.c	Wed Oct 26 15:12:35 2011 +0000
@@ -44,6 +44,7 @@
 #include "help_mp.h"
 #include "m_option.h"
 #include "m_struct.h"
+#include "mp_msg.h"
 #include "path.h"
 #include "libavutil/avstring.h"
 
--- a/stream/stream_live555.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_live555.c	Wed Oct 26 15:12:35 2011 +0000
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "stream.h"
 #include "network.h"
 #include "libmpdemux/demuxer.h"
--- a/stream/stream_nemesi.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_nemesi.c	Wed Oct 26 15:12:35 2011 +0000
@@ -30,6 +30,7 @@
 
 #include <errno.h>
 
+#include "mp_msg.h"
 #include "network.h"
 #include "stream.h"
 #include "libmpdemux/demuxer.h"
--- a/stream/stream_rtp.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_rtp.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "network.h"
 #include "stream.h"
 #include "url.h"
--- a/stream/stream_udp.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/stream/stream_udp.c	Wed Oct 26 15:12:35 2011 +0000
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mp_msg.h"
 #include "network.h"
 #include "stream.h"
 #include "url.h"
--- a/sub/av_sub.c	Wed Oct 26 15:12:25 2011 +0000
+++ b/sub/av_sub.c	Wed Oct 26 15:12:35 2011 +0000
@@ -18,6 +18,7 @@
 
 #include "libavcodec/avcodec.h"
 #include "libmpdemux/stheader.h"
+#include "mp_msg.h"
 #include "sub.h"
 #include "spudec.h"
 #include "av_sub.h"