diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ad_internal.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae.h | 7 | ||||
-rw-r--r-- | libmpcodecs/ae_faac.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_lame.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_lavc.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_pcm.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_toolame.h | 6 | ||||
-rw-r--r-- | libmpcodecs/ae_twolame.h | 6 | ||||
-rw-r--r-- | libmpcodecs/cmmx.h | 6 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.h | 6 | ||||
-rw-r--r-- | libmpcodecs/dec_video.h | 6 | ||||
-rw-r--r-- | libmpcodecs/img_format.h | 7 | ||||
-rw-r--r-- | libmpcodecs/mp_image.h | 6 | ||||
-rw-r--r-- | libmpcodecs/mpc_info.h | 6 | ||||
-rw-r--r-- | libmpcodecs/native/alaw.h | 6 | ||||
-rw-r--r-- | libmpcodecs/native/mmx.h | 6 | ||||
-rw-r--r-- | libmpcodecs/native/xa_gsm.h | 6 | ||||
-rw-r--r-- | libmpcodecs/native/xa_gsm_int.h | 6 | ||||
-rw-r--r-- | libmpcodecs/pullup.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vd.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vd_internal.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vf.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vf_scale.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vfcap.h | 6 | ||||
-rw-r--r-- | libmpcodecs/vqf.h | 6 |
26 files changed, 78 insertions, 80 deletions
diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h index d9178a85c2..34a654e071 100644 --- a/libmpcodecs/ad.h +++ b/libmpcodecs/ad.h @@ -1,5 +1,5 @@ -#ifndef AD_H -#define AD_H +#ifndef MPLAYER_AD_H +#define MPLAYER_AD_H #include "mpc_info.h" typedef mp_codec_info_t ad_info_t; @@ -30,4 +30,4 @@ extern ad_functions_t* mpcodecs_ad_drivers[]; // fallback: use hw mixer in libao #define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */ -#endif /* AD_H */ +#endif /* MPLAYER_AD_H */ diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h index c7a2457535..0bd01bcd6c 100644 --- a/libmpcodecs/ad_internal.h +++ b/libmpcodecs/ad_internal.h @@ -1,5 +1,5 @@ -#ifndef AD_INTERNAL_H -#define AD_INTERNAL_H +#ifndef MPLAYER_AD_INTERNAL_H +#define MPLAYER_AD_INTERNAL_H #include "codec-cfg.h" #include "libaf/af_format.h" @@ -26,4 +26,4 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxl decode_audio\ }; -#endif /* AD_INTERNAL_H */ +#endif /* MPLAYER_AD_INTERNAL_H */ diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h index d92d56f513..fb5744ece7 100644 --- a/libmpcodecs/ae.h +++ b/libmpcodecs/ae.h @@ -1,6 +1,5 @@ - -#ifndef AE_H -#define AE_H +#ifndef MPLAYER_AE_H +#define MPLAYER_AE_H #define ACODEC_COPY 0 #define ACODEC_PCM 1 @@ -43,4 +42,4 @@ typedef struct audio_encoder_s { audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); -#endif /* AE_H */ +#endif /* MPLAYER_AE_H */ diff --git a/libmpcodecs/ae_faac.h b/libmpcodecs/ae_faac.h index 10366e03b6..13e970e0d7 100644 --- a/libmpcodecs/ae_faac.h +++ b/libmpcodecs/ae_faac.h @@ -1,8 +1,8 @@ -#ifndef AE_FAAC_H -#define AE_FAAC_H +#ifndef MPLAYER_AE_FAAC_H +#define MPLAYER_AE_FAAC_H #include "ae.h" int mpae_init_faac(audio_encoder_t *encoder); -#endif /* AE_FAAC_H */ +#endif /* MPLAYER_AE_FAAC_H */ diff --git a/libmpcodecs/ae_lame.h b/libmpcodecs/ae_lame.h index 221e5ffe64..39ff83a72b 100644 --- a/libmpcodecs/ae_lame.h +++ b/libmpcodecs/ae_lame.h @@ -1,8 +1,8 @@ -#ifndef AE_LAME_H -#define AE_LAME_H +#ifndef MPLAYER_AE_LAME_H +#define MPLAYER_AE_LAME_H #include "ae.h" int mpae_init_lame(audio_encoder_t *encoder); -#endif /* AE_LAME_H */ +#endif /* MPLAYER_AE_LAME_H */ diff --git a/libmpcodecs/ae_lavc.h b/libmpcodecs/ae_lavc.h index b2000b7583..f84eeaaf56 100644 --- a/libmpcodecs/ae_lavc.h +++ b/libmpcodecs/ae_lavc.h @@ -1,8 +1,8 @@ -#ifndef AE_LAVC_H -#define AE_LAVC_H +#ifndef MPLAYER_AE_LAVC_H +#define MPLAYER_AE_LAVC_H #include "ae.h" int mpae_init_lavc(audio_encoder_t *encoder); -#endif /* AE_LAVC_H */ +#endif /* MPLAYER_AE_LAVC_H */ diff --git a/libmpcodecs/ae_pcm.h b/libmpcodecs/ae_pcm.h index 5eae0631b1..54698d56ca 100644 --- a/libmpcodecs/ae_pcm.h +++ b/libmpcodecs/ae_pcm.h @@ -1,8 +1,8 @@ -#ifndef AE_PCM_H -#define AE_PCM_H +#ifndef MPLAYER_AE_PCM_H +#define MPLAYER_AE_PCM_H #include "ae.h" int mpae_init_pcm(audio_encoder_t *encoder); -#endif /* AE_PCM_H */ +#endif /* MPLAYER_AE_PCM_H */ diff --git a/libmpcodecs/ae_toolame.h b/libmpcodecs/ae_toolame.h index 06c8c35b8e..ee00b6c301 100644 --- a/libmpcodecs/ae_toolame.h +++ b/libmpcodecs/ae_toolame.h @@ -1,5 +1,5 @@ -#ifndef AE_TOOLAME_H -#define AE_TOOLAME_H +#ifndef MPLAYER_AE_TOOLAME_H +#define MPLAYER_AE_TOOLAME_H #include "ae.h" #include <toolame.h> @@ -13,4 +13,4 @@ typedef struct { int mpae_init_toolame(audio_encoder_t *encoder); -#endif /* AE_TOOLAME_H */ +#endif /* MPLAYER_AE_TOOLAME_H */ diff --git a/libmpcodecs/ae_twolame.h b/libmpcodecs/ae_twolame.h index ae226ea059..a7dd16832d 100644 --- a/libmpcodecs/ae_twolame.h +++ b/libmpcodecs/ae_twolame.h @@ -1,5 +1,5 @@ -#ifndef AE_TWOLAME_H -#define AE_TWOLAME_H +#ifndef MPLAYER_AE_TWOLAME_H +#define MPLAYER_AE_TWOLAME_H #include "ae.h" #include <twolame.h> @@ -11,4 +11,4 @@ typedef struct { int mpae_init_twolame(audio_encoder_t *encoder); -#endif /* AE_TWOLAME_H */ +#endif /* MPLAYER_AE_TWOLAME_H */ diff --git a/libmpcodecs/cmmx.h b/libmpcodecs/cmmx.h index 27b3070282..6e0c8509f5 100644 --- a/libmpcodecs/cmmx.h +++ b/libmpcodecs/cmmx.h @@ -4,8 +4,8 @@ * Author: Zoltan Hidvegi */ -#ifndef CMMX_H -#define CMMX_H +#ifndef MPLAYER_CMMX_H +#define MPLAYER_CMMX_H typedef unsigned long cmmx_t; @@ -183,4 +183,4 @@ pcmpeqb(cmmx_t a, cmmx_t b) return pcmpzb(a ^ b); } -#endif /* CMMX_H */ +#endif /* MPLAYER_CMMX_H */ diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h index 0c325ced62..0a09ad5be1 100644 --- a/libmpcodecs/dec_audio.h +++ b/libmpcodecs/dec_audio.h @@ -1,5 +1,5 @@ -#ifndef DEC_AUDIO_H -#define DEC_AUDIO_H +#ifndef MPLAYER_DEC_AUDIO_H +#define MPLAYER_DEC_AUDIO_H // dec_audio.c: extern void afm_help(void); @@ -12,4 +12,4 @@ extern void uninit_audio(sh_audio_t *sh_audio); extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate, int *out_samplerate, int *out_channels, int *out_format); -#endif /* DEC_AUDIO_H */ +#endif /* MPLAYER_DEC_AUDIO_H */ diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h index 7e73133144..641981b30c 100644 --- a/libmpcodecs/dec_video.h +++ b/libmpcodecs/dec_video.h @@ -1,5 +1,5 @@ -#ifndef DEC_VIDEO_H -#define DEC_VIDEO_H +#ifndef MPLAYER_DEC_VIDEO_H +#define MPLAYER_DEC_VIDEO_H // dec_video.c: extern void vfm_help(void); @@ -21,4 +21,4 @@ extern int get_current_video_decoder_lag(sh_video_t *sh_video); extern int divx_quality; -#endif /* DEC_VIDEO_H */ +#endif /* MPLAYER_DEC_VIDEO_H */ diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index 5f6040a267..c15269b580 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -1,6 +1,5 @@ - -#ifndef IMG_FORMAT_H -#define IMG_FORMAT_H +#ifndef MPLAYER_IMG_FORMAT_H +#define MPLAYER_IMG_FORMAT_H /* RGB/BGR Formats */ @@ -117,4 +116,4 @@ typedef struct { const char *vo_format_name(int format); -#endif /* IMG_FORMAT_H */ +#endif /* MPLAYER_IMG_FORMAT_H */ diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index 624a9d66c3..fb1ce76a09 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -1,5 +1,5 @@ -#ifndef MP_IMAGE_H -#define MP_IMAGE_H +#ifndef MPLAYER_MP_IMAGE_H +#define MPLAYER_MP_IMAGE_H //--------- codec's requirements (filled by the codec/vf) --------- @@ -228,4 +228,4 @@ static inline void free_mp_image(mp_image_t* mpi){ mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt); void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi); -#endif /* MP_IMAGE_H */ +#endif /* MPLAYER_MP_IMAGE_H */ diff --git a/libmpcodecs/mpc_info.h b/libmpcodecs/mpc_info.h index fadf898290..845f6a73e4 100644 --- a/libmpcodecs/mpc_info.h +++ b/libmpcodecs/mpc_info.h @@ -1,5 +1,5 @@ -#ifndef MPC_INFO_H -#define MPC_INFO_H +#ifndef MPLAYER_MPC_INFO_H +#define MPLAYER_MPC_INFO_H typedef struct mp_codec_info_s { @@ -22,4 +22,4 @@ typedef struct mp_codec_info_s #define CONTROL_ERROR -2 #define CONTROL_NA -3 -#endif /* MPC_INFO_H */ +#endif /* MPLAYER_MPC_INFO_H */ diff --git a/libmpcodecs/native/alaw.h b/libmpcodecs/native/alaw.h index 840fa6b2c9..e086e1d151 100644 --- a/libmpcodecs/native/alaw.h +++ b/libmpcodecs/native/alaw.h @@ -1,7 +1,7 @@ // Generated by TOOLS/alaw-gen.c -#ifndef ALAW_H -#define ALAW_H +#ifndef MPLAYER_ALAW_H +#define MPLAYER_ALAW_H const short alaw2short[]={ -5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736, @@ -73,4 +73,4 @@ const short ulaw2short[]={ 56, 48, 40, 32, 24, 16, 8, 0 }; -#endif /* ALAW_H */ +#endif /* MPLAYER_ALAW_H */ diff --git a/libmpcodecs/native/mmx.h b/libmpcodecs/native/mmx.h index 0a41e0e8a7..d9a6fb65cb 100644 --- a/libmpcodecs/native/mmx.h +++ b/libmpcodecs/native/mmx.h @@ -1,5 +1,5 @@ -#ifndef MMX_H -#define MMX_H +#ifndef MPLAYER_MMX_H +#define MPLAYER_MMX_H typedef union { long long q; /* Quadword (64-bit) value */ @@ -77,4 +77,4 @@ typedef union { #define emms() __asm__ __volatile__ ("emms") -#endif /* MMX_H */ +#endif /* MPLAYER_MMX_H */ diff --git a/libmpcodecs/native/xa_gsm.h b/libmpcodecs/native/xa_gsm.h index 670d9a418c..da577a4df1 100644 --- a/libmpcodecs/native/xa_gsm.h +++ b/libmpcodecs/native/xa_gsm.h @@ -1,8 +1,8 @@ -#ifndef XA_GSM_H -#define XA_GSM_H +#ifndef MPLAYER_XA_GSM_H +#define MPLAYER_XA_GSM_H void XA_MSGSM_Decoder(unsigned char *ibuf,unsigned short *obuf); void XA_GSM_Decoder(unsigned char *ibuf,unsigned short *obuf); void GSM_Init(void); -#endif /* XA_GSM_H */ +#endif /* MPLAYER_XA_GSM_H */ diff --git a/libmpcodecs/native/xa_gsm_int.h b/libmpcodecs/native/xa_gsm_int.h index a147308445..40a31a8cb3 100644 --- a/libmpcodecs/native/xa_gsm_int.h +++ b/libmpcodecs/native/xa_gsm_int.h @@ -22,8 +22,8 @@ * ********************************************************************/ -#ifndef XA_GSM_INT_H -#define XA_GSM_INT_H +#ifndef MPLAYER_XA_GSM_INT_H +#define MPLAYER_XA_GSM_INT_H #include "xa_gsm.h" @@ -131,4 +131,4 @@ typedef struct { */ -#endif /* XA_GSM_INT_H */ +#endif /* MPLAYER_XA_GSM_INT_H */ diff --git a/libmpcodecs/pullup.h b/libmpcodecs/pullup.h index 04a2f95bb7..4b1dbb2d55 100644 --- a/libmpcodecs/pullup.h +++ b/libmpcodecs/pullup.h @@ -1,5 +1,5 @@ -#ifndef PULLUP_H -#define PULLUP_H +#ifndef MPLAYER_PULLUP_H +#define MPLAYER_PULLUP_H #define PULLUP_CPU_MMX 1 #define PULLUP_CPU_MMX2 2 @@ -81,4 +81,4 @@ void pullup_preinit_context(struct pullup_context *c); void pullup_init_context(struct pullup_context *c); void pullup_free_context(struct pullup_context *c); -#endif /* PULLUP_H */ +#endif /* MPLAYER_PULLUP_H */ diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h index c37c0e40cf..4c4ef11340 100644 --- a/libmpcodecs/vd.h +++ b/libmpcodecs/vd.h @@ -1,5 +1,5 @@ -#ifndef VD_H -#define VD_H +#ifndef MPLAYER_VD_H +#define MPLAYER_VD_H #include "mp_image.h" #include "mpc_info.h" @@ -35,4 +35,4 @@ void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w #define VDFLAGS_DROPFRAME 3 -#endif /* VD_H */ +#endif /* MPLAYER_VD_H */ diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h index c396c379f1..d04903e26a 100644 --- a/libmpcodecs/vd_internal.h +++ b/libmpcodecs/vd_internal.h @@ -1,5 +1,5 @@ -#ifndef VD_INTERNAL_H -#define VD_INTERNAL_H +#ifndef MPLAYER_VD_INTERNAL_H +#define MPLAYER_VD_INTERNAL_H #include "codec-cfg.h" #include "img_format.h" @@ -27,4 +27,4 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags); decode\ }; -#endif /* VD_INTERNAL_H */ +#endif /* MPLAYER_VD_INTERNAL_H */ diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h index d4451f4b5b..d5113b049f 100644 --- a/libmpcodecs/vf.h +++ b/libmpcodecs/vf.h @@ -1,5 +1,5 @@ -#ifndef VF_H -#define VF_H +#ifndef MPLAYER_VF_H +#define MPLAYER_VF_H struct vf_instance_s; struct vf_priv_s; @@ -123,4 +123,4 @@ int vf_config_wrapper(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt); -#endif /* VF_H */ +#endif /* MPLAYER_VF_H */ diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h index 18c1f3af1f..851f4af6d5 100644 --- a/libmpcodecs/vf_scale.h +++ b/libmpcodecs/vf_scale.h @@ -1,9 +1,9 @@ //GPL -#ifndef VF_SCALE_H -#define VF_SCALE_H +#ifndef MPLAYER_VF_SCALE_H +#define MPLAYER_VF_SCALE_H int get_sws_cpuflags(void); struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat); -#endif /* VF_SCALE_H */ +#endif /* MPLAYER_VF_SCALE_H */ diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h index 88a2c8737b..9745a5c9bd 100644 --- a/libmpcodecs/vfcap.h +++ b/libmpcodecs/vfcap.h @@ -1,7 +1,7 @@ // VFCAP_* values: they are flags, returned by query_format(): -#ifndef VFCAP_H -#define VFCAP_H +#ifndef MPLAYER_VFCAP_H +#define MPLAYER_VFCAP_H // set, if the given colorspace is supported (with or without conversion) #define VFCAP_CSP_SUPPORTED 0x1 @@ -34,4 +34,4 @@ // filter will draw EOSD at screen resolution (without scaling) #define VFCAP_EOSD_UNSCALED 0x4000 -#endif /* VFCAP_H */ +#endif /* MPLAYER_VFCAP_H */ diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h index 8e43889def..e5d2368eac 100644 --- a/libmpcodecs/vqf.h +++ b/libmpcodecs/vqf.h @@ -5,8 +5,8 @@ // Modified for MPlayer on 2004.12.29 -#ifndef VQF_H -#define VQF_H +#ifndef MPLAYER_VQF_H +#define MPLAYER_VQF_H #ifdef _MSC_VER # ifdef DLL_MODULE @@ -223,4 +223,4 @@ DllPort int TvqGetFbTotalBits(); // query total number of used bits #endif -#endif /* VQF_H */ +#endif /* MPLAYER_VQF_H */ |