diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-10-17 13:37:46 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-10-17 13:37:46 +0400 |
commit | 5b21bdabe43611385d1d55a21d5b1f607b133d29 (patch) | |
tree | f2365284f51cf77d62573fa8a2d7f15c50baf8be /libavformat | |
parent | 6a03549e8a25c2223c117201424899339c0e7be7 (diff) |
Add FFMPEG_ prefix to all multiple inclusion guards.
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/asf.h | 6 | ||||
-rw-r--r-- | libavformat/avformat.h | 7 | ||||
-rw-r--r-- | libavformat/avio.h | 7 | ||||
-rw-r--r-- | libavformat/dv.h | 6 | ||||
-rw-r--r-- | libavformat/dv1394.h | 6 | ||||
-rw-r--r-- | libavformat/flv.h | 6 | ||||
-rw-r--r-- | libavformat/framehook.h | 6 | ||||
-rw-r--r-- | libavformat/matroska.h | 6 | ||||
-rw-r--r-- | libavformat/mpeg.h | 6 | ||||
-rw-r--r-- | libavformat/mpegts.h | 6 | ||||
-rw-r--r-- | libavformat/network.h | 6 | ||||
-rw-r--r-- | libavformat/nut.h | 6 | ||||
-rw-r--r-- | libavformat/ogg2.h | 6 | ||||
-rw-r--r-- | libavformat/os_support.h | 6 | ||||
-rw-r--r-- | libavformat/qtpalette.h | 6 | ||||
-rw-r--r-- | libavformat/raw.h | 6 | ||||
-rw-r--r-- | libavformat/riff.h | 6 | ||||
-rw-r--r-- | libavformat/rm.h | 6 | ||||
-rw-r--r-- | libavformat/rtp.h | 6 | ||||
-rw-r--r-- | libavformat/rtp_aac.h | 6 | ||||
-rw-r--r-- | libavformat/rtp_h264.h | 7 | ||||
-rw-r--r-- | libavformat/rtp_internal.h | 6 | ||||
-rw-r--r-- | libavformat/rtp_mpv.h | 6 | ||||
-rw-r--r-- | libavformat/rtsp.h | 6 | ||||
-rw-r--r-- | libavformat/rtspcodes.h | 6 | ||||
-rw-r--r-- | libavformat/voc.h | 6 |
26 files changed, 79 insertions, 80 deletions
diff --git a/libavformat/asf.h b/libavformat/asf.h index 8387aa50f9..ca92f4c16d 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_ASF_H -#define AVFORMAT_ASF_H +#ifndef FFMPEG_ASF_H +#define FFMPEG_ASF_H #include <stdint.h> #include "avformat.h" @@ -286,4 +286,4 @@ static const GUID my_guid = { #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 -#endif // AVFORMAT_ASF_H +#endif /* FFMPEG_ASF_H */ diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 770ab7e87b..dbbb9b48c3 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_H -#define AVFORMAT_H +#ifndef FFMPEG_AVFORMAT_H +#define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_INT ((51<<16)+(15<<8)+0) #define LIBAVFORMAT_VERSION 51.15.0 @@ -930,5 +930,4 @@ int match_ext(const char *filename, const char *extensions); #endif /* HAVE_AV_CONFIG_H */ -#endif /* AVFORMAT_H */ - +#endif /* FFMPEG_AVFORMAT_H */ diff --git a/libavformat/avio.h b/libavformat/avio.h index 6606226007..eb93e47e5d 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -18,8 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVIO_H -#define AVIO_H +#ifndef FFMPEG_AVIO_H +#define FFMPEG_AVIO_H #include <stdint.h> @@ -266,5 +266,4 @@ int udp_set_remote_url(URLContext *h, const char *uri); int udp_get_local_port(URLContext *h); int udp_get_file_handle(URLContext *h); -#endif - +#endif /* FFMPEG_AVIO_H */ diff --git a/libavformat/dv.h b/libavformat/dv.h index 0e33a2f21a..cfe93533a7 100644 --- a/libavformat/dv.h +++ b/libavformat/dv.h @@ -25,8 +25,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_DV_H -#define AVFORMAT_DV_H +#ifndef FFMPEG_DV_H +#define FFMPEG_DV_H #include "avformat.h" @@ -41,4 +41,4 @@ DVMuxContext* dv_init_mux(AVFormatContext* s); int dv_assemble_frame(DVMuxContext *c, AVStream*, const uint8_t*, int, uint8_t**); void dv_delete_mux(DVMuxContext*); -#endif // AVFORMAT_DV_H +#endif /* FFMPEG_DV_H */ diff --git a/libavformat/dv1394.h b/libavformat/dv1394.h index 67671e5cf8..7f3521d6e8 100644 --- a/libavformat/dv1394.h +++ b/libavformat/dv1394.h @@ -25,8 +25,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef DV_1394_H -#define DV_1394_H +#ifndef FFMPEG_DV1394_H +#define FFMPEG_DV1394_H #define DV1394_DEFAULT_CHANNEL 63 #define DV1394_DEFAULT_CARD 0 @@ -353,4 +353,4 @@ struct dv1394_status { }; -#endif /* DV_1394_H */ +#endif /* FFMPEG_DV1394_H */ diff --git a/libavformat/flv.h b/libavformat/flv.h index 1484ac15d6..59418390e4 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -21,8 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FLV_H -#define FLV_H +#ifndef FFMPEG_FLV_H +#define FFMPEG_FLV_H /* offsets for packed values */ #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1 @@ -107,4 +107,4 @@ typedef enum { AMF_DATA_TYPE_UNSUPPORTED = 0x0d, } AMFDataType; -#endif /* FLV_H */ +#endif /* FFMPEG_FLV_H */ diff --git a/libavformat/framehook.h b/libavformat/framehook.h index 1902ebc909..3210cae04f 100644 --- a/libavformat/framehook.h +++ b/libavformat/framehook.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef FRAMEHOOK_H -#define FRAMEHOOK_H +#ifndef FFMPEG_FRAMEHOOK_H +#define FFMPEG_FRAMEHOOK_H #warning VHOOK is deprecated. Please help porting libmpcodecs or a better filter system to FFmpeg instead of wasting your time writing new filters for this crappy one. @@ -49,4 +49,4 @@ extern int frame_hook_add(int argc, char *argv[]); extern void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts); extern void frame_hook_release(void); -#endif +#endif /* FFMPEG_FRAMEHOOK_H */ diff --git a/libavformat/matroska.h b/libavformat/matroska.h index a683bc70b3..8842161e06 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef MATROSKA_H -#define MATROSKA_H +#ifndef FFMPEG_MATROSKA_H +#define FFMPEG_MATROSKA_H #include "avcodec.h" @@ -194,4 +194,4 @@ typedef struct CodecTags{ extern CodecTags ff_mkv_codec_tags[]; -#endif /* MATROSKA_H */ +#endif /* FFMPEG_MATROSKA_H */ diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index 94c703d464..053b1590ea 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_MPEG_H -#define AVFORMAT_MPEG_H +#ifndef FFMPEG_MPEG_H +#define FFMPEG_MPEG_H #define PACK_START_CODE ((unsigned int)0x000001ba) #define SYSTEM_HEADER_START_CODE ((unsigned int)0x000001bb) @@ -57,4 +57,4 @@ static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; -#endif /* AVFORMAT_MPEG_H */ +#endif /* FFMPEG_MPEG_H */ diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index ef0ede6890..cd11495e55 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_MPEGTS_H -#define AVFORMAT_MPEGTS_H +#ifndef FFMPEG_MPEGTS_H +#define FFMPEG_MPEGTS_H #include "avformat.h" @@ -65,4 +65,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, const uint8_t *buf, int len); void mpegts_parse_close(MpegTSContext *ts); -#endif /* AVFORMAT_MPEGTS_H */ +#endif /* FFMPEG_MPEGTS_H */ diff --git a/libavformat/network.h b/libavformat/network.h index 4c9a3a07c0..d897722c94 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef NETWORK_H -#define NETWORK_H +#ifndef FFMPEG_NETWORK_H +#define FFMPEG_NETWORK_H #ifdef HAVE_WINSOCK2_H #include <winsock2.h> @@ -66,4 +66,4 @@ static inline void ff_network_close(void) int inet_aton (const char * str, struct in_addr * add); #endif -#endif +#endif /* FFMPEG_NETWORK_H */ diff --git a/libavformat/nut.h b/libavformat/nut.h index 3507ced26d..74492cd9ad 100644 --- a/libavformat/nut.h +++ b/libavformat/nut.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_NUT_H -#define AVFORMAT_NUT_H +#ifndef FFMPEG_NUT_H +#define FFMPEG_NUT_H //#include <limits.h> #include "avformat.h" @@ -100,4 +100,4 @@ int ff_nut_sp_pos_cmp(syncpoint_t *a, syncpoint_t *b); int ff_nut_sp_pts_cmp(syncpoint_t *a, syncpoint_t *b); void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts); -#endif /* AVFORMAT_NUT_H */ +#endif /* FFMPEG_NUT_H */ diff --git a/libavformat/ogg2.h b/libavformat/ogg2.h index 55a4a75e3f..656a3f95aa 100644 --- a/libavformat/ogg2.h +++ b/libavformat/ogg2.h @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. **/ -#ifndef OGG2_H -#define OGG2_H +#ifndef FFMPEG_OGG2_H +#define FFMPEG_OGG2_H #include "avformat.h" @@ -84,4 +84,4 @@ extern ogg_codec_t ogm_old_codec; extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size); -#endif /* OGG2_H */ +#endif /* FFMPEG_OGG2_H */ diff --git a/libavformat/os_support.h b/libavformat/os_support.h index 029223a56c..9c0965c5c1 100644 --- a/libavformat/os_support.h +++ b/libavformat/os_support.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef OS_SUPPORT_H -#define OS_SUPPORT_H +#ifndef FFMPEG_OS_SUPPORT_H +#define FFMPEG_OS_SUPPORT_H /** * @file os_support.h @@ -96,4 +96,4 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout); #endif /* HAVE_SYS_POLL_H */ #endif /* CONFIG_FFSERVER */ -#endif /* OS_SUPPORT_H */ +#endif /* FFMPEG_OS_SUPPORT_H */ diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h index 183600fdef..088abf3e57 100644 --- a/libavformat/qtpalette.h +++ b/libavformat/qtpalette.h @@ -20,8 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef QTPALETTE_H -#define QTPALETTE_H +#ifndef FFMPEG_QTPALETTE_H +#define FFMPEG_QTPALETTE_H unsigned char ff_qt_default_palette_4[4 * 4] = { 0x93, 0x65, 0x5E, 0x00, @@ -308,4 +308,4 @@ unsigned char ff_qt_default_palette_256[256 * 4] = { /* 255, 0xFF */ 0x00, 0x00, 0x00, 0x00 }; -#endif +#endif /* FFMPEG_QTPALETTE_H */ diff --git a/libavformat/raw.h b/libavformat/raw.h index ce3e45c932..3d851c829b 100644 --- a/libavformat/raw.h +++ b/libavformat/raw.h @@ -19,12 +19,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RAW_H -#define AVFORMAT_RAW_H +#ifndef FFMPEG_RAW_H +#define FFMPEG_RAW_H #include "avformat.h" int pcm_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp, int flags); -#endif /* AVFORMAT_RAW_H */ +#endif /* FFMPEG_RAW_H */ diff --git a/libavformat/riff.h b/libavformat/riff.h index 274d184872..dc970f619d 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -25,8 +25,8 @@ * do NOT include this in end user applications */ -#ifndef FF_RIFF_H -#define FF_RIFF_H +#ifndef FFMPEG_RIFF_H +#define FFMPEG_RIFF_H #include "avcodec.h" #include "avio.h" @@ -51,4 +51,4 @@ unsigned int codec_get_tag(const AVCodecTag *tags, int id); enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag); void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale); -#endif +#endif /* FFMPEG_RIFF_H */ diff --git a/libavformat/rm.h b/libavformat/rm.h index 2e307c2125..553fbccc42 100644 --- a/libavformat/rm.h +++ b/libavformat/rm.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RM_H -#define RM_H +#ifndef FFMPEG_RM_H +#define FFMPEG_RM_H #include "avformat.h" @@ -57,4 +57,4 @@ typedef struct { int sub_packet_lengths[16]; /// Length of each aac subpacket } RMContext; -#endif /* RM_H */ +#endif /* FFMPEG_RM_H */ diff --git a/libavformat/rtp.h b/libavformat/rtp.h index bcdb769102..38db56e763 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -18,8 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTP_H -#define RTP_H +#ifndef FFMPEG_RTP_H +#define FFMPEG_RTP_H #include "avcodec.h" #include "avformat.h" @@ -122,4 +122,4 @@ typedef enum { #endif extern AVRtpPayloadType_t AVRtpPayloadTypes[]; -#endif /* RTP_H */ +#endif /* FFMPEG_RTP_H */ diff --git a/libavformat/rtp_aac.h b/libavformat/rtp_aac.h index caa65907cc..f89edf1eb7 100644 --- a/libavformat/rtp_aac.h +++ b/libavformat/rtp_aac.h @@ -17,9 +17,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTP_AAC_H -#define RTP_AAC_H +#ifndef FFMPEG_RTP_AAC_H +#define FFMPEG_RTP_AAC_H void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size); -#endif /* RTP_AAC_H */ +#endif /* FFMPEG_RTP_AAC_H */ diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h index f12809bc3c..57fc5325ea 100644 --- a/libavformat/rtp_h264.h +++ b/libavformat/rtp_h264.h @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTP_H264_H -#define RTP_H264_H +#ifndef FFMPEG_RTP_H264_H +#define FFMPEG_RTP_H264_H #include "rtp_internal.h" extern RTPDynamicProtocolHandler ff_h264_dynamic_handler; -#endif /* RTP_H264_H */ + +#endif /* FFMPEG_RTP_H264_H */ diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h index 4bfa4bba62..6ef797cb70 100644 --- a/libavformat/rtp_internal.h +++ b/libavformat/rtp_internal.h @@ -20,8 +20,8 @@ */ // this is a bit of a misnomer, because rtp & rtsp internal structures and prototypes are in here. -#ifndef RTP_INTERNAL_H -#define RTP_INTERNAL_H +#ifndef FFMPEG_RTP_INTERNAL_H +#define FFMPEG_RTP_INTERNAL_H #include <stdint.h> #include "avcodec.h" @@ -116,5 +116,5 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m); void av_register_rtp_dynamic_payload_handlers(void); -#endif /* RTP_INTERNAL_H */ +#endif /* FFMPEG_RTP_INTERNAL_H */ diff --git a/libavformat/rtp_mpv.h b/libavformat/rtp_mpv.h index 41133672ad..4a7568d754 100644 --- a/libavformat/rtp_mpv.h +++ b/libavformat/rtp_mpv.h @@ -17,9 +17,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTP_MPV_H -#define RTP_MPV_H +#ifndef FFMPEG_RTP_MPV_H +#define FFMPEG_RTP_MPV_H void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size); -#endif /* RTP_MPV_H */ +#endif /* FFMPEG_RTP_MPV_H */ diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index a41032ddc3..67d37d6871 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -18,8 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RTSP_H -#define RTSP_H +#ifndef FFMPEG_RTSP_H +#define FFMPEG_RTSP_H #include <stdint.h> #include "avformat.h" @@ -88,4 +88,4 @@ extern int rtsp_rtp_port_max; int rtsp_pause(AVFormatContext *s); int rtsp_resume(AVFormatContext *s); -#endif /* RTSP_H */ +#endif /* FFMPEG_RTSP_H */ diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h index 9e4d87bae6..d4ad25b76f 100644 --- a/libavformat/rtspcodes.h +++ b/libavformat/rtspcodes.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_RTSPCODES_H -#define AVFORMAT_RTSPCODES_H +#ifndef FFMPEG_RTSPCODES_H +#define FFMPEG_RTSPCODES_H /** RTSP handling */ enum RTSPStatusCode { @@ -37,4 +37,4 @@ RTSP_STATUS_SERVICE =503, /**< Service Unavailable */ RTSP_STATUS_VERSION =505, /**< RTSP Version not supported */ }; -#endif // AVFORMAT_RTSPCODES_H +#endif /* FFMPEG_RTSPCODES_H */ diff --git a/libavformat/voc.h b/libavformat/voc.h index e98ca39911..606f2152e5 100644 --- a/libavformat/voc.h +++ b/libavformat/voc.h @@ -19,8 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef VOC_H -#define VOC_H +#ifndef FFMPEG_VOC_H +#define FFMPEG_VOC_H #include "avformat.h" #include "riff.h" /* for CodecTag */ @@ -48,4 +48,4 @@ extern const AVCodecTag voc_codec_tags[]; int voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size); -#endif +#endif /* FFMPEG_VOC_H */ |