diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-22 09:09:46 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-22 09:09:46 +0000 |
commit | 8efb2fa21c81f99b37795621f9ec2bc125c6ced0 (patch) | |
tree | 9a6f354228affe704b16844775070159e82b5fcd /libmpdemux | |
parent | 50899e9083661200d9bb105dca0339c14e56d271 (diff) | |
download | mpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.bz2 mpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.xz |
Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/asf.h | 6 | ||||
-rw-r--r-- | libmpdemux/aviheader.h | 6 | ||||
-rw-r--r-- | libmpdemux/demux_avs.h | 6 | ||||
-rw-r--r-- | libmpdemux/demux_rtp.h | 6 | ||||
-rw-r--r-- | libmpdemux/demux_rtp_internal.h | 6 | ||||
-rw-r--r-- | libmpdemux/demux_xmms_plugin.h | 6 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 6 | ||||
-rw-r--r-- | libmpdemux/ebml.h | 6 | ||||
-rw-r--r-- | libmpdemux/genres.h | 8 | ||||
-rw-r--r-- | libmpdemux/matroska.h | 6 | ||||
-rw-r--r-- | libmpdemux/mf.h | 6 | ||||
-rw-r--r-- | libmpdemux/mp3_hdr.h | 6 | ||||
-rw-r--r-- | libmpdemux/mpeg_hdr.h | 6 | ||||
-rw-r--r-- | libmpdemux/mpeg_packetizer.h | 6 | ||||
-rw-r--r-- | libmpdemux/ms_hdr.h | 6 | ||||
-rw-r--r-- | libmpdemux/muxer.h | 6 | ||||
-rw-r--r-- | libmpdemux/nuppelvideo.h | 6 | ||||
-rw-r--r-- | libmpdemux/parse_es.h | 6 | ||||
-rw-r--r-- | libmpdemux/parse_mp4.h | 6 | ||||
-rw-r--r-- | libmpdemux/qtpalette.h | 6 | ||||
-rw-r--r-- | libmpdemux/stheader.h | 6 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg.h | 6 | ||||
-rw-r--r-- | libmpdemux/yuv4mpeg_intern.h | 6 |
23 files changed, 69 insertions, 71 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 6eb6b101e0..1f89edf7fb 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -1,5 +1,5 @@ -#ifndef ASF_H -#define ASF_H +#ifndef MPLAYER_ASF_H +#define MPLAYER_ASF_H //#include "config.h" /* for WORDS_BIGENDIAN */ #include <inttypes.h> @@ -244,4 +244,4 @@ struct asf_priv { unsigned bps; }; -#endif /* ASF_H */ +#endif /* MPLAYER_ASF_H */ diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h index 581e1c9b39..3c1e782062 100644 --- a/libmpdemux/aviheader.h +++ b/libmpdemux/aviheader.h @@ -1,5 +1,5 @@ -#ifndef AVIHEADER_H -#define AVIHEADER_H +#ifndef MPLAYER_AVIHEADER_H +#define MPLAYER_AVIHEADER_H //#include "config.h" /* get correct definition WORDS_BIGENDIAN */ #include "libavutil/common.h" @@ -353,4 +353,4 @@ typedef struct { #define AVI_IDX_OFFSET(x) ((((uint64_t)(x)->dwFlags&0xffff0000)<<16)+(x)->dwChunkOffset) -#endif /* AVIHEADER_H */ +#endif /* MPLAYER_AVIHEADER_H */ diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h index b45f8cc575..49cb1d6131 100644 --- a/libmpdemux/demux_avs.h +++ b/libmpdemux/demux_avs.h @@ -21,8 +21,8 @@ * Boston, MA 02110-1301 USA. */ -#ifndef DEMUX_AVS_H -#define DEMUX_AVS_H +#ifndef MPLAYER_DEMUX_AVS_H +#define MPLAYER_DEMUX_AVS_H enum { AVISYNTH_INTERFACE_VERSION = 2 }; @@ -166,4 +166,4 @@ static inline int avs_bits_per_pixel(const AVS_VideoInfo * p) } } -#endif /* DEMUX_AVS_H */ +#endif /* MPLAYER_DEMUX_AVS_H */ diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index 5eba3a680e..b60ec54fe1 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.h @@ -1,5 +1,5 @@ -#ifndef DEMUX_RTP_H -#define DEMUX_RTP_H +#ifndef MPLAYER_DEMUX_RTP_H +#define MPLAYER_DEMUX_RTP_H #include <stdlib.h> #include <stdio.h> @@ -28,4 +28,4 @@ int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds); // Close a RTP demuxer void demux_close_rtp(demuxer_t* demuxer); -#endif /* DEMUX_RTP_H */ +#endif /* MPLAYER_DEMUX_RTP_H */ diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index ba92e2b33d..d3dde77fd2 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.h @@ -1,5 +1,5 @@ -#ifndef DEMUX_RTP_INTERNAL_H -#define DEMUX_RTP_INTERNAL_H +#ifndef MPLAYER_DEMUX_RTP_INTERNAL_H +#define MPLAYER_DEMUX_RTP_INTERNAL_H #include <stdlib.h> @@ -41,4 +41,4 @@ Boolean awaitRTPPacket(demuxer_t* demuxer, demux_stream_t* ds, // "streamType": 0 => video; 1 => audio // This routine returns False if the input stream has closed -#endif /* DEMUX_RTP_INTERNAL_H */ +#endif /* MPLAYER_DEMUX_RTP_INTERNAL_H */ diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h index e0020fd224..dd9183b26b 100644 --- a/libmpdemux/demux_xmms_plugin.h +++ b/libmpdemux/demux_xmms_plugin.h @@ -21,8 +21,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -#ifndef DEMUX_XMMS_PLUGIN_H -#define DEMUX_XMMS_PLUGIN_H +#ifndef MPLAYER_DEMUX_XMMS_PLUGIN_H +#define MPLAYER_DEMUX_XMMS_PLUGIN_H typedef enum { @@ -152,4 +152,4 @@ typedef struct VisPlugin void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */ } VisPlugin; -#endif /* DEMUX_XMMS_PLUGIN_H */ +#endif /* MPLAYER_DEMUX_XMMS_PLUGIN_H */ diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 08f7ad538e..76f4baca16 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,5 +1,5 @@ -#ifndef DEMUXER_H -#define DEMUXER_H +#ifndef MPLAYER_DEMUXER_H +#define MPLAYER_DEMUXER_H #ifdef USE_ASS #include "libass/ass_types.h" @@ -421,4 +421,4 @@ int demuxer_set_angle(demuxer_t *demuxer, int angle); /// Get number of angles. int demuxer_angles_count(demuxer_t *demuxer); -#endif /* DEMUXER_H */ +#endif /* MPLAYER_DEMUXER_H */ diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h index 967bffa118..919fd526df 100644 --- a/libmpdemux/ebml.h +++ b/libmpdemux/ebml.h @@ -1,5 +1,5 @@ -#ifndef EBML_H -#define EBML_H +#ifndef MPLAYER_EBML_H +#define MPLAYER_EBML_H #include <inttypes.h> @@ -188,4 +188,4 @@ int ebml_read_skip (stream_t *s, uint64_t *length); uint32_t ebml_read_master (stream_t *s, uint64_t *length); char *ebml_read_header (stream_t *s, int *version); -#endif /* EBML_H */ +#endif /* MPLAYER_EBML_H */ diff --git a/libmpdemux/genres.h b/libmpdemux/genres.h index 54f97b36f4..523b48c3db 100644 --- a/libmpdemux/genres.h +++ b/libmpdemux/genres.h @@ -13,9 +13,8 @@ * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/ */ - -#ifndef GENRES_H -#define GENRES_H +#ifndef MPLAYER_GENRES_H +#define MPLAYER_GENRES_H const char * const genres[] = { @@ -277,5 +276,4 @@ const char * const genres[] = { "Unknown", /* 255 */ }; - -#endif /* GENRES_H */ +#endif /* MPLAYER_GENRES_H */ diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h index 9efce44d27..d4238ff90c 100644 --- a/libmpdemux/matroska.h +++ b/libmpdemux/matroska.h @@ -4,8 +4,8 @@ * see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html */ -#ifndef MATROSKA_H -#define MATROSKA_H +#ifndef MPLAYER_MATROSKA_H +#define MPLAYER_MATROSKA_H #define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN" #define MKV_A_AAC_2LC "A_AAC/MPEG2/LC" @@ -67,4 +67,4 @@ void demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang, void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang, int maxlen); -#endif /* MATROSKA_H */ +#endif /* MPLAYER_MATROSKA_H */ diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h index 1e58c7293d..fe104f47b3 100644 --- a/libmpdemux/mf.h +++ b/libmpdemux/mf.h @@ -1,6 +1,6 @@ -#ifndef MF_H -#define MF_H +#ifndef MPLAYER_MF_H +#define MPLAYER_MF_H extern int mf_w; extern int mf_h; @@ -16,4 +16,4 @@ typedef struct mf_t* open_mf(char * filename); -#endif /* MF_H */ +#endif /* MPLAYER_MF_H */ diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h index 8133b5ed29..d5aa70b651 100644 --- a/libmpdemux/mp3_hdr.h +++ b/libmpdemux/mp3_hdr.h @@ -1,5 +1,5 @@ -#ifndef MP3_HDR_H -#define MP3_HDR_H +#ifndef MPLAYER_MP3_HDR_H +#define MPLAYER_MP3_HDR_H int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br); @@ -12,4 +12,4 @@ static inline int mp_check_mp3_header(unsigned int head){ return 1; } -#endif /* MP3_HDR_H */ +#endif /* MPLAYER_MP3_HDR_H */ diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h index 31ac33378c..dc2c1646d8 100644 --- a/libmpdemux/mpeg_hdr.h +++ b/libmpdemux/mpeg_hdr.h @@ -1,5 +1,5 @@ -#ifndef MPEG_HDR_H -#define MPEG_HDR_H +#ifndef MPLAYER_MPEG_HDR_H +#define MPLAYER_MPEG_HDR_H typedef struct { // video info: @@ -30,4 +30,4 @@ void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer); int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len); int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len); -#endif /* MPEG_HDR_H */ +#endif /* MPLAYER_MPEG_HDR_H */ diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h index 1273b86b3a..5fb8de95c3 100644 --- a/libmpdemux/mpeg_packetizer.h +++ b/libmpdemux/mpeg_packetizer.h @@ -22,8 +22,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MPEG_PACKETIZER_H -#define MPEG_PACKETIZER_H +#ifndef MPLAYER_MPEG_PACKETIZER_H +#define MPLAYER_MPEG_PACKETIZER_H /* Send MPEG <type> PES packet */ int send_mpeg_pes_packet (unsigned char *data, int len, int id, uint64_t pts, @@ -38,4 +38,4 @@ int send_mpeg_lpcm_packet (unsigned char *data, int len, int id, uint64_t pts, int freq_id, int my_write (const unsigned char *data, int len)); -#endif /* MPEG_PACKETIZER_H */ +#endif /* MPLAYER_MPEG_PACKETIZER_H */ diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 4595f269dd..6b810569d7 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -1,5 +1,5 @@ -#ifndef MS_HDR_H -#define MS_HDR_H +#ifndef MPLAYER_MS_HDR_H +#define MPLAYER_MS_HDR_H #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ @@ -79,4 +79,4 @@ typedef struct { #endif #endif -#endif /* MS_HDR_H */ +#endif /* MPLAYER_MS_HDR_H */ diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h index a01206af44..3c22e140c2 100644 --- a/libmpdemux/muxer.h +++ b/libmpdemux/muxer.h @@ -1,5 +1,5 @@ -#ifndef MUXER_H -#define MUXER_H +#ifndef MPLAYER_MUXER_H +#define MPLAYER_MUXER_H #define MUXER_MAX_STREAMS 16 @@ -116,4 +116,4 @@ int muxer_init_muxer_rawvideo(muxer_t *); int muxer_init_muxer_lavf(muxer_t *); int muxer_init_muxer_rawaudio(muxer_t *); -#endif /* MUXER_H */ +#endif /* MPLAYER_MUXER_H */ diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h index f1b81cced5..5534318e82 100644 --- a/libmpdemux/nuppelvideo.h +++ b/libmpdemux/nuppelvideo.h @@ -1,7 +1,7 @@ /* nuppelvideo.h rh */ -#ifndef NUPPELVIDEO_H -#define NUPPELVIDEO_H +#ifndef MPLAYER_NUPPELVIDEO_H +#define MPLAYER_NUPPELVIDEO_H #include "libavutil/intfloat_readwrite.h" @@ -159,4 +159,4 @@ typedef struct audbuffertype (h)->lavc_maxqdiff = le2me_32((h)->lavc_maxqdiff); \ } -#endif /* NUPPELVIDEO_H */ +#endif /* MPLAYER_NUPPELVIDEO_H */ diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h index fceed0c895..9852701ee1 100644 --- a/libmpdemux/parse_es.h +++ b/libmpdemux/parse_es.h @@ -1,5 +1,5 @@ -#ifndef PARSE_ES_H -#define PARSE_ES_H +#ifndef MPLAYER_PARSE_ES_H +#define MPLAYER_PARSE_ES_H #define MAX_VIDEO_PACKET_SIZE (224*1024+4) #define VIDEOBUFFER_SIZE 0x100000 @@ -18,4 +18,4 @@ int read_video_packet(demux_stream_t *ds); // return: next packet code int skip_video_packet(demux_stream_t *ds); -#endif /* PARSE_ES_H */ +#endif /* MPLAYER_PARSE_ES_H */ diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h index 9173d36a86..585751c320 100644 --- a/libmpdemux/parse_mp4.h +++ b/libmpdemux/parse_mp4.h @@ -4,8 +4,8 @@ * File licensed under the GPL, see http://www.fsf.org/ for more info. */ -#ifndef PARSE_MP4_H -#define PARSE_MP4_H +#ifndef MPLAYER_PARSE_MP4_H +#define MPLAYER_PARSE_MP4_H #include <inttypes.h> @@ -107,5 +107,5 @@ typedef struct { int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds); void mp4_free_esds(esds_t *esds); -#endif /* PARSE_MP4_H */ +#endif /* MPLAYER_PARSE_MP4_H */ diff --git a/libmpdemux/qtpalette.h b/libmpdemux/qtpalette.h index 1e0a63fa46..d2e3a33c5a 100644 --- a/libmpdemux/qtpalette.h +++ b/libmpdemux/qtpalette.h @@ -2,8 +2,8 @@ // Automatically generated from a utility derived from XAnim: // http://xanim.va.pubnix.com/home.html -#ifndef QTPALETTE_H -#define QTPALETTE_H +#ifndef MPLAYER_QTPALETTE_H +#define MPLAYER_QTPALETTE_H static const unsigned char qt_default_palette_4[4 * 4] = { 0x5E, 0x65, 0x93, 0x00, @@ -568,4 +568,4 @@ static const unsigned char qt_default_grayscale_palette_256[256 * 4] = { /* 255, 0xFF */ 0x00, 0x00, 0x00, 0x00 }; -#endif /* QTPALETTE_H */ +#endif /* MPLAYER_QTPALETTE_H */ diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 1c727f07c8..7ebeefb07f 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -1,5 +1,5 @@ -#ifndef STHEADER_H -#define STHEADER_H +#ifndef MPLAYER_STHEADER_H +#define MPLAYER_STHEADER_H #include "aviheader.h" #include "ms_hdr.h" @@ -121,4 +121,4 @@ void free_sh_video(sh_video_t *sh); int video_read_properties(sh_video_t *sh_video); int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps); -#endif /* STHEADER_H */ +#endif /* MPLAYER_STHEADER_H */ diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h index 157d426c0e..3609388596 100644 --- a/libmpdemux/yuv4mpeg.h +++ b/libmpdemux/yuv4mpeg.h @@ -24,8 +24,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef YUV4MPEG_H -#define YUV4MPEG_H +#ifndef MPLAYER_YUV4MPEG_H +#define MPLAYER_YUV4MPEG_H #include <stdlib.h> //#include "mp_msg.h" @@ -449,6 +449,6 @@ int y4m_allow_unknown_tags(int yn); ************************************************************************ ************************************************************************/ -#endif /* YUV4MPEG_H */ +#endif /* MPLAYER_YUV4MPEG_H */ diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h index edf447509e..a956bbf4e9 100644 --- a/libmpdemux/yuv4mpeg_intern.h +++ b/libmpdemux/yuv4mpeg_intern.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef YUV4MPEG_INTERN_H -#define YUV4MPEG_INTERN_H +#ifndef MPLAYER_YUV4MPEG_INTERN_H +#define MPLAYER_YUV4MPEG_INTERN_H #define Y4M_MAGIC "YUV4MPEG2" @@ -75,4 +75,4 @@ #define Y4M_DAR_MPEG2_3 { 16, 9 } #define Y4M_DAR_MPEG2_4 { 221, 100 } -#endif /* YUV4MPEG_INTERN_H */ +#endif /* MPLAYER_YUV4MPEG_INTERN_H */ |