Mercurial > libavformat.hg

changeset 2620:792383dd085e libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add FFMPEG_ prefix to all multiple inclusion guards.
author diego
date Wed, 17 Oct 2007 09:37:46 +0000
parents ed220a21ffa5
children 2aea27e618ba
files asf.h avformat.h avio.h dv.h dv1394.h flv.h framehook.h matroska.h mpeg.h mpegts.h network.h nut.h ogg2.h os_support.h qtpalette.h raw.h riff.h rm.h rtp.h rtp_aac.h rtp_h264.h rtp_internal.h rtp_mpv.h rtsp.h rtspcodes.h voc.h
diffstat 26 files changed, 79 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/asf.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/asf.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-#endif // AVFORMAT_ASF_H
+#endif /* FFMPEG_ASF_H */
--- a/avformat.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/avformat.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#endif /* AVFORMAT_H */
-
+#endif /* FFMPEG_AVFORMAT_H */
--- a/avio.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/avio.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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_get_local_port(URLContext *h);
 int udp_get_file_handle(URLContext *h);
 
-#endif
-
+#endif /* FFMPEG_AVIO_H */
--- a/dv.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/dv.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 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 */
--- a/dv1394.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/dv1394.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 };
 
 
-#endif /* DV_1394_H */
+#endif /* FFMPEG_DV1394_H */
--- a/flv.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/flv.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FLV_H */
+#endif /* FFMPEG_FLV_H */
--- a/framehook.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/framehook.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 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 */
--- a/matroska.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/matroska.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 
 extern CodecTags ff_mkv_codec_tags[];
 
-#endif /* MATROSKA_H */
+#endif /* FFMPEG_MATROSKA_H */
--- a/mpeg.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/mpeg.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */
--- a/mpegts.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/mpegts.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif /* AVFORMAT_MPEGTS_H */
+#endif /* FFMPEG_MPEGTS_H */
--- a/network.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/network.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 int inet_aton (const char * str, struct in_addr * add);
 #endif
 
-#endif
+#endif /* FFMPEG_NETWORK_H */
--- a/nut.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/nut.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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_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 */
--- a/ogg2.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/ogg2.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* OGG2_H */
+#endif /* FFMPEG_OGG2_H */
--- a/os_support.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/os_support.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 #endif /* HAVE_SYS_POLL_H */
 #endif /* CONFIG_FFSERVER */
 
-#endif /* OS_SUPPORT_H */
+#endif /* FFMPEG_OS_SUPPORT_H */
--- a/qtpalette.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/qtpalette.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif
+#endif /* FFMPEG_QTPALETTE_H */
--- a/raw.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/raw.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */
--- a/riff.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/riff.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 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 */
--- a/rm.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rm.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
     int sub_packet_lengths[16]; /// Length of each aac subpacket
 } RMContext;
 
-#endif /* RM_H */
+#endif /* FFMPEG_RM_H */
--- a/rtp.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtp.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 #endif
 
 extern AVRtpPayloadType_t AVRtpPayloadTypes[];
-#endif /* RTP_H */
+#endif /* FFMPEG_RTP_H */
--- a/rtp_aac.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtp_aac.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */
--- a/rtp_h264.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtp_h264.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */
--- a/rtp_internal.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtp_internal.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 av_register_rtp_dynamic_payload_handlers(void);
 
-#endif /* RTP_INTERNAL_H */
+#endif /* FFMPEG_RTP_INTERNAL_H */
 
--- a/rtp_mpv.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtp_mpv.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 */
--- a/rtsp.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtsp.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 int rtsp_pause(AVFormatContext *s);
 int rtsp_resume(AVFormatContext *s);
 
-#endif /* RTSP_H */
+#endif /* FFMPEG_RTSP_H */
--- a/rtspcodes.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/rtspcodes.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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_VERSION         =505, /**< RTSP Version not supported */
 };
 
-#endif // AVFORMAT_RTSPCODES_H
+#endif /* FFMPEG_RTSPCODES_H */
--- a/voc.h	Wed Oct 17 09:16:21 2007 +0000
+++ b/voc.h	Wed Oct 17 09:37:46 2007 +0000
@@ -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 @@
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif
+#endif /* FFMPEG_VOC_H */