changeset 3852:1b6245500d8c libavformat

Globally rename the header inclusion guard names. Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_".
author stefano
date Sun, 31 Aug 2008 07:39:47 +0000
parents 9b3ad7f292a4
children 8137bcada0cd
files asf.h asfcrypt.h avc.h avformat.h avi.h avio.h dv.h ffm.h flv.h framehook.h gxf.h internal.h isom.h matroska.h mpeg.h mpegts.h mxf.h network.h nut.h oggdec.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 swf.h voc.h
diffstat 34 files changed, 102 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/asf.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/asf.h	Sun Aug 31 07:39:47 2008 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ASF_H
-#define FFMPEG_ASF_H
+#ifndef AVFORMAT_ASF_H
+#define AVFORMAT_ASF_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -286,4 +286,4 @@
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-#endif /* FFMPEG_ASF_H */
+#endif /* AVFORMAT_ASF_H */
--- a/asfcrypt.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/asfcrypt.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ASFCRYPT_H
-#define FFMPEG_ASFCRYPT_H
+#ifndef AVFORMAT_ASFCRYPT_H
+#define AVFORMAT_ASFCRYPT_H
 
 #include <inttypes.h>
 
 void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len);
 
-#endif /* FFMPEG_ASFCRYPT_H */
+#endif /* AVFORMAT_ASFCRYPT_H */
--- a/avc.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/avc.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVC_H
-#define FFMPEG_AVC_H
+#ifndef AVFORMAT_AVC_H
+#define AVFORMAT_AVC_H
 
 #include <stdint.h>
 #include "avio.h"
@@ -29,4 +29,4 @@
 int ff_isom_write_avcc(ByteIOContext *pb, const uint8_t *data, int len);
 const uint8_t *ff_avc_find_startcode(const uint8_t *p, const uint8_t *end);
 
-#endif /* FFMPEG_AVC_H */
+#endif /* AVFORMAT_AVC_H */
--- a/avformat.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/avformat.h	Sun Aug 31 07:39:47 2008 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFORMAT_H
-#define FFMPEG_AVFORMAT_H
+#ifndef AVFORMAT_AVFORMAT_H
+#define AVFORMAT_AVFORMAT_H
 
 #define LIBAVFORMAT_VERSION_MAJOR 52
 #define LIBAVFORMAT_VERSION_MINOR 21
@@ -1104,4 +1104,4 @@
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#endif /* FFMPEG_AVFORMAT_H */
+#endif /* AVFORMAT_AVFORMAT_H */
--- a/avi.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/avi.h	Sun Aug 31 07:39:47 2008 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVI_H
-#define FFMPEG_AVI_H
+#ifndef AVFORMAT_AVI_H
+#define AVFORMAT_AVI_H
 
 #define AVIF_HASINDEX           0x00000010        // Index at end of file?
 #define AVIF_MUSTUSEINDEX       0x00000020
@@ -34,4 +34,4 @@
 /* index flags */
 #define AVIIF_INDEX             0x10
 
-#endif /* FFMPEG_AVI_H */
+#endif /* AVFORMAT_AVI_H */
--- a/avio.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/avio.h	Sun Aug 31 07:39:47 2008 +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 FFMPEG_AVIO_H
-#define FFMPEG_AVIO_H
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
 
 #include <stdint.h>
 
@@ -368,4 +368,4 @@
 int udp_get_local_port(URLContext *h);
 int udp_get_file_handle(URLContext *h);
 
-#endif /* FFMPEG_AVIO_H */
+#endif /* AVFORMAT_AVIO_H */
--- a/dv.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/dv.h	Sun Aug 31 07:39:47 2008 +0000
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_DV_H
-#define FFMPEG_DV_H
+#ifndef AVFORMAT_DV_H
+#define AVFORMAT_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 /* FFMPEG_DV_H */
+#endif /* AVFORMAT_DV_H */
--- a/ffm.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/ffm.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FFM_H
-#define FFMPEG_FFM_H
+#ifndef AVFORMAT_FFM_H
+#define AVFORMAT_FFM_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -55,4 +55,4 @@
     uint8_t packet[FFM_PACKET_SIZE];
 } FFMContext;
 
-#endif /* FFMPEG_FFM_H */
+#endif /* AVFORMAT_FFM_H */
--- a/flv.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/flv.h	Sun Aug 31 07:39:47 2008 +0000
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FLV_H
-#define FFMPEG_FLV_H
+#ifndef AVFORMAT_FLV_H
+#define AVFORMAT_FLV_H
 
 /* offsets for packed values */
 #define FLV_AUDIO_SAMPLESSIZE_OFFSET 1
@@ -110,4 +110,4 @@
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FFMPEG_FLV_H */
+#endif /* AVFORMAT_FLV_H */
--- a/framehook.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/framehook.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_FRAMEHOOK_H
-#define FFMPEG_FRAMEHOOK_H
+#ifndef AVFORMAT_FRAMEHOOK_H
+#define AVFORMAT_FRAMEHOOK_H
 
 #warning VHOOK is deprecated. Please help finishing libavfilter instead of wasting your time writing new filters for this crappy filter system.
 
@@ -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 /* FFMPEG_FRAMEHOOK_H */
+#endif /* AVFORMAT_FRAMEHOOK_H */
--- a/gxf.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/gxf.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_GXF_H
-#define FFMPEG_GXF_H
+#ifndef AVFORMAT_GXF_H
+#define AVFORMAT_GXF_H
 
 /* gxf.c */
 typedef enum {
@@ -50,4 +50,4 @@
     TRACK_FPF       = 0x52,
 } track_tag_t;
 
-#endif /* FFMPEG_GXF_H */
+#endif /* AVFORMAT_GXF_H */
--- a/internal.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/internal.h	Sun Aug 31 07:39:47 2008 +0000
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AVFORMAT_UTILS_H
-#define FFMPEG_AVFORMAT_UTILS_H
+#ifndef AVFORMAT_INTERNAL_H
+#define AVFORMAT_INTERNAL_H
 
 char *ff_data_to_hex(char *buf, const uint8_t *src, int size);
 
-#endif /* FFMPEG_AVFORMAT_UTILS_H */
+#endif /* AVFORMAT_INTERNAL_H */
--- a/isom.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/isom.h	Sun Aug 31 07:39:47 2008 +0000
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_ISOM_H
-#define FFMPEG_ISOM_H
+#ifndef AVFORMAT_ISOM_H
+#define AVFORMAT_ISOM_H
 
 #include "riff.h"
 
@@ -40,4 +40,4 @@
     int duration;
 } MOV_stts_t;
 
-#endif /* FFMPEG_ISOM_H */
+#endif /* AVFORMAT_ISOM_H */
--- a/matroska.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/matroska.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MATROSKA_H
-#define FFMPEG_MATROSKA_H
+#ifndef AVFORMAT_MATROSKA_H
+#define AVFORMAT_MATROSKA_H
 
 #include "libavcodec/avcodec.h"
 
@@ -231,4 +231,4 @@
 extern const CodecTags ff_mkv_codec_tags[];
 extern const CodecMime ff_mkv_mime_tags[];
 
-#endif /* FFMPEG_MATROSKA_H */
+#endif /* AVFORMAT_MATROSKA_H */
--- a/mpeg.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/mpeg.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPEG_H
-#define FFMPEG_MPEG_H
+#ifndef AVFORMAT_MPEG_H
+#define AVFORMAT_MPEG_H
 
 #include <stdint.h>
 #include "libavutil/intreadwrite.h"
@@ -69,4 +69,4 @@
              AV_RB16(buf+3) >> 1;
 }
 
-#endif /* FFMPEG_MPEG_H */
+#endif /* AVFORMAT_MPEG_H */
--- a/mpegts.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/mpegts.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_MPEGTS_H
-#define FFMPEG_MPEGTS_H
+#ifndef AVFORMAT_MPEGTS_H
+#define AVFORMAT_MPEGTS_H
 
 #include "avformat.h"
 
@@ -67,4 +67,4 @@
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif /* FFMPEG_MPEGTS_H */
+#endif /* AVFORMAT_MPEGTS_H */
--- a/mxf.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/mxf.h	Sun Aug 31 07:39:47 2008 +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 FFMPEG_MXF_H
-#define FFMPEG_MXF_H
+#ifndef AVFORMAT_MXF_H
+#define AVFORMAT_MXF_H
 
 #include "avformat.h"
 #include "libavcodec/bytestream.h"
@@ -71,4 +71,4 @@
 #define PRINT_KEY(pc, s, x)
 #endif
 
-#endif /* FFMPEG_MXF_H */
+#endif /* AVFORMAT_MXF_H */
--- a/network.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/network.h	Sun Aug 31 07:39:47 2008 +0000
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_NETWORK_H
-#define FFMPEG_NETWORK_H
+#ifndef AVFORMAT_NETWORK_H
+#define AVFORMAT_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 /* FFMPEG_NETWORK_H */
+#endif /* AVFORMAT_NETWORK_H */
--- a/nut.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/nut.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_NUT_H
-#define FFMPEG_NUT_H
+#ifndef AVFORMAT_NUT_H
+#define AVFORMAT_NUT_H
 
 //#include <limits.h>
 //#include "libavutil/adler32.h"
@@ -112,4 +112,4 @@
 
 extern const Dispositions ff_nut_dispositions[];
 
-#endif /* FFMPEG_NUT_H */
+#endif /* AVFORMAT_NUT_H */
--- a/oggdec.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/oggdec.h	Sun Aug 31 07:39:47 2008 +0000
@@ -22,8 +22,8 @@
     DEALINGS IN THE SOFTWARE.
 **/
 
-#ifndef FFMPEG_OGGDEC_H
-#define FFMPEG_OGGDEC_H
+#ifndef AVFORMAT_OGGDEC_H
+#define AVFORMAT_OGGDEC_H
 
 #include "avformat.h"
 
@@ -87,4 +87,4 @@
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* FFMPEG_OGGDEC_H */
+#endif /* AVFORMAT_OGGDEC_H */
--- a/os_support.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/os_support.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_OS_SUPPORT_H
-#define FFMPEG_OS_SUPPORT_H
+#ifndef AVFORMAT_OS_SUPPORT_H
+#define AVFORMAT_OS_SUPPORT_H
 
 /**
  * @file os_support.h
@@ -92,4 +92,4 @@
 #endif /* CONFIG_FFSERVER */
 #endif /* CONFIG_NETWORK */
 
-#endif /* FFMPEG_OS_SUPPORT_H */
+#endif /* AVFORMAT_OS_SUPPORT_H */
--- a/qtpalette.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/qtpalette.h	Sun Aug 31 07:39:47 2008 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_QTPALETTE_H
-#define FFMPEG_QTPALETTE_H
+#ifndef AVFORMAT_QTPALETTE_H
+#define AVFORMAT_QTPALETTE_H
 
 #include <inttypes.h>
 
@@ -310,4 +310,4 @@
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif /* FFMPEG_QTPALETTE_H */
+#endif /* AVFORMAT_QTPALETTE_H */
--- a/raw.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/raw.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RAW_H
-#define FFMPEG_RAW_H
+#ifndef AVFORMAT_RAW_H
+#define AVFORMAT_RAW_H
 
 #include "avformat.h"
 
 int pcm_read_seek(AVFormatContext *s,
                   int stream_index, int64_t timestamp, int flags);
 
-#endif /* FFMPEG_RAW_H */
+#endif /* AVFORMAT_RAW_H */
--- a/riff.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/riff.h	Sun Aug 31 07:39:47 2008 +0000
@@ -25,8 +25,8 @@
  * do NOT include this in end user applications
  */
 
-#ifndef FFMPEG_RIFF_H
-#define FFMPEG_RIFF_H
+#ifndef AVFORMAT_RIFF_H
+#define AVFORMAT_RIFF_H
 
 #include "libavcodec/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 /* FFMPEG_RIFF_H */
+#endif /* AVFORMAT_RIFF_H */
--- a/rm.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rm.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RM_H
-#define FFMPEG_RM_H
+#ifndef AVFORMAT_RM_H
+#define AVFORMAT_RM_H
 
 #include "avformat.h"
 
@@ -105,4 +105,4 @@
  */
 void ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt);
 
-#endif /* FFMPEG_RM_H */
+#endif /* AVFORMAT_RM_H */
--- a/rtp.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtp.h	Sun Aug 31 07:39:47 2008 +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 FFMPEG_RTP_H
-#define FFMPEG_RTP_H
+#ifndef AVFORMAT_RTP_H
+#define AVFORMAT_RTP_H
 
 #include "libavcodec/avcodec.h"
 #include "avformat.h"
@@ -110,4 +110,4 @@
 } rtcp_sdes_type_t;
 #endif
 
-#endif /* FFMPEG_RTP_H */
+#endif /* AVFORMAT_RTP_H */
--- a/rtp_aac.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtp_aac.h	Sun Aug 31 07:39:47 2008 +0000
@@ -17,11 +17,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_RTP_AAC_H
-#define FFMPEG_RTP_AAC_H
+#ifndef AVFORMAT_RTP_AAC_H
+#define AVFORMAT_RTP_AAC_H
 
 #include "avformat.h"
 
 void ff_rtp_send_aac(AVFormatContext *s1, const uint8_t *buff, int size);
 
-#endif /* FFMPEG_RTP_AAC_H */
+#endif /* AVFORMAT_RTP_AAC_H */
--- a/rtp_h264.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtp_h264.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,12 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RTP_H264_H
-#define FFMPEG_RTP_H264_H
+#ifndef AVFORMAT_RTP_H264_H
+#define AVFORMAT_RTP_H264_H
 
 #include "rtp_internal.h"
 
 extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
 void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
 
-#endif /* FFMPEG_RTP_H264_H */
+#endif /* AVFORMAT_RTP_H264_H */
--- a/rtp_internal.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtp_internal.h	Sun Aug 31 07:39:47 2008 +0000
@@ -20,8 +20,8 @@
  */
 
 // this is a bit of a misnomer, because rtp & rtsp internal structures and prototypes are in here.
-#ifndef FFMPEG_RTP_INTERNAL_H
-#define FFMPEG_RTP_INTERNAL_H
+#ifndef AVFORMAT_RTP_INTERNAL_H
+#define AVFORMAT_RTP_INTERNAL_H
 
 #include <stdint.h>
 #include "libavcodec/avcodec.h"
@@ -127,5 +127,5 @@
 
 void av_register_rtp_dynamic_payload_handlers(void);
 
-#endif /* FFMPEG_RTP_INTERNAL_H */
+#endif /* AVFORMAT_RTP_INTERNAL_H */
 
--- a/rtp_mpv.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtp_mpv.h	Sun Aug 31 07:39:47 2008 +0000
@@ -17,11 +17,11 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef FFMPEG_RTP_MPV_H
-#define FFMPEG_RTP_MPV_H
+#ifndef AVFORMAT_RTP_MPV_H
+#define AVFORMAT_RTP_MPV_H
 
 #include "avformat.h"
 
 void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size);
 
-#endif /* FFMPEG_RTP_MPV_H */
+#endif /* AVFORMAT_RTP_MPV_H */
--- a/rtsp.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtsp.h	Sun Aug 31 07:39:47 2008 +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 FFMPEG_RTSP_H
-#define FFMPEG_RTSP_H
+#ifndef AVFORMAT_RTSP_H
+#define AVFORMAT_RTSP_H
 
 #include <stdint.h>
 #include "avformat.h"
@@ -95,4 +95,4 @@
 int rtsp_pause(AVFormatContext *s);
 int rtsp_resume(AVFormatContext *s);
 
-#endif /* FFMPEG_RTSP_H */
+#endif /* AVFORMAT_RTSP_H */
--- a/rtspcodes.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/rtspcodes.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_RTSPCODES_H
-#define FFMPEG_RTSPCODES_H
+#ifndef AVFORMAT_RTSPCODES_H
+#define AVFORMAT_RTSPCODES_H
 
 /** RTSP handling */
 enum RTSPStatusCode {
@@ -37,4 +37,4 @@
 RTSP_STATUS_VERSION         =505, /**< RTSP Version not supported */
 };
 
-#endif /* FFMPEG_RTSPCODES_H */
+#endif /* AVFORMAT_RTSPCODES_H */
--- a/swf.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/swf.h	Sun Aug 31 07:39:47 2008 +0000
@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_SWF_H
-#define FFMPEG_SWF_H
+#ifndef AVFORMAT_SWF_H
+#define AVFORMAT_SWF_H
 
 #include "libavutil/fifo.h"
 #include "avformat.h"
@@ -94,4 +94,4 @@
     {0, 0},
 };
 
-#endif /* FFMPEG_SWF_H */
+#endif /* AVFORMAT_SWF_H */
--- a/voc.h	Sun Aug 31 04:35:09 2008 +0000
+++ b/voc.h	Sun Aug 31 07:39:47 2008 +0000
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_VOC_H
-#define FFMPEG_VOC_H
+#ifndef AVFORMAT_VOC_H
+#define AVFORMAT_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 /* FFMPEG_VOC_H */
+#endif /* AVFORMAT_VOC_H */