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_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk

34 files changed, 102 insertions, 102 deletions

diff --git a/libavformat/asf.h b/libavformat/asf.h
index 2486d8a6fa..4ccae1091a 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 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 @@ static const GUID my_guid = {
 
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
-#endif /* FFMPEG_ASF_H */
+#endif /* AVFORMAT_ASF_H */
diff --git a/libavformat/asfcrypt.h b/libavformat/asfcrypt.h
index dcd9c1da7d..8b80d63c5d 100644
--- a/libavformat/asfcrypt.h
+++ b/libavformat/asfcrypt.h
@@ -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 */
diff --git a/libavformat/avc.h b/libavformat/avc.h
index f8732d6f0f..2ea938ca16 100644
--- a/libavformat/avc.h
+++ b/libavformat/avc.h
@@ -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_avc_parse_nal_units(const uint8_t *buf_in, uint8_t **buf, int *size);
 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 */
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 624266ce64..efe6c2b2ae 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 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 @@ int match_ext(const char *filename, const char *extensions);
 
 #endif /* HAVE_AV_CONFIG_H */
 
-#endif /* FFMPEG_AVFORMAT_H */
+#endif /* AVFORMAT_AVFORMAT_H */
diff --git a/libavformat/avi.h b/libavformat/avi.h
index 3d3dd549ff..2214c03b98 100644
--- a/libavformat/avi.h
+++ b/libavformat/avi.h
@@ -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 */
diff --git a/libavformat/avio.h b/libavformat/avio.h
index 8137cb54dc..ef53154ff0 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 FFMPEG_AVIO_H
-#define FFMPEG_AVIO_H
+#ifndef AVFORMAT_AVIO_H
+#define AVFORMAT_AVIO_H
 
 #include <stdint.h>
 
@@ -368,4 +368,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 /* FFMPEG_AVIO_H */
+#endif /* AVFORMAT_AVIO_H */
diff --git a/libavformat/dv.h b/libavformat/dv.h
index cfe93533a7..a8c051456b 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 FFMPEG_DV_H
-#define FFMPEG_DV_H
+#ifndef AVFORMAT_DV_H
+#define AVFORMAT_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 /* FFMPEG_DV_H */
+#endif /* AVFORMAT_DV_H */
diff --git a/libavformat/ffm.h b/libavformat/ffm.h
index 1ede49a285..0ed5c227f3 100644
--- a/libavformat/ffm.h
+++ b/libavformat/ffm.h
@@ -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 @@ typedef struct FFMContext {
     uint8_t packet[FFM_PACKET_SIZE];
 } FFMContext;
 
-#endif /* FFMPEG_FFM_H */
+#endif /* AVFORMAT_FFM_H */
diff --git a/libavformat/flv.h b/libavformat/flv.h
index 938383e83e..efa8cebe8a 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 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 @@ typedef enum {
     AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
-#endif /* FFMPEG_FLV_H */
+#endif /* AVFORMAT_FLV_H */
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index ce068d78d0..9dc144b0d4 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 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 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 /* FFMPEG_FRAMEHOOK_H */
+#endif /* AVFORMAT_FRAMEHOOK_H */
diff --git a/libavformat/gxf.h b/libavformat/gxf.h
index ab37cb97ff..4212704bb9 100644
--- a/libavformat/gxf.h
+++ b/libavformat/gxf.h
@@ -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 @@ typedef enum {
     TRACK_FPF       = 0x52,
 } track_tag_t;
 
-#endif /* FFMPEG_GXF_H */
+#endif /* AVFORMAT_GXF_H */
diff --git a/libavformat/internal.h b/libavformat/internal.h
index a380ecefda..4397b53260 100644
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -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 */
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 7a66ce5240..2fb4dbf2d3 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -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 @@ typedef struct {
     int duration;
 } MOV_stts_t;
 
-#endif /* FFMPEG_ISOM_H */
+#endif /* AVFORMAT_ISOM_H */
diff --git a/libavformat/matroska.h b/libavformat/matroska.h
index 2e6aae2077..e93447d144 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 FFMPEG_MATROSKA_H
-#define FFMPEG_MATROSKA_H
+#ifndef AVFORMAT_MATROSKA_H
+#define AVFORMAT_MATROSKA_H
 
 #include "libavcodec/avcodec.h"
 
@@ -231,4 +231,4 @@ typedef struct CodecMime{
 extern const CodecTags ff_mkv_codec_tags[];
 extern const CodecMime ff_mkv_mime_tags[];
 
-#endif /* FFMPEG_MATROSKA_H */
+#endif /* AVFORMAT_MATROSKA_H */
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h
index c1675ee442..ff146bba14 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 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 @@ static inline int64_t ff_parse_pes_pts(uint8_t *buf) {
              AV_RB16(buf+3) >> 1;
 }
 
-#endif /* FFMPEG_MPEG_H */
+#endif /* AVFORMAT_MPEG_H */
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 92cc491c83..896836d7a1 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 FFMPEG_MPEGTS_H
-#define FFMPEG_MPEGTS_H
+#ifndef AVFORMAT_MPEGTS_H
+#define AVFORMAT_MPEGTS_H
 
 #include "avformat.h"
 
@@ -67,4 +67,4 @@ int mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                         const uint8_t *buf, int len);
 void mpegts_parse_close(MpegTSContext *ts);
 
-#endif /* FFMPEG_MPEGTS_H */
+#endif /* AVFORMAT_MPEGTS_H */
diff --git a/libavformat/mxf.h b/libavformat/mxf.h
index 11b1821aec..f4033de3dd 100644
--- a/libavformat/mxf.h
+++ b/libavformat/mxf.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 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 @@ extern const MXFCodecUL ff_mxf_codec_uls[];
 #define PRINT_KEY(pc, s, x)
 #endif
 
-#endif /* FFMPEG_MXF_H */
+#endif /* AVFORMAT_MXF_H */
diff --git a/libavformat/network.h b/libavformat/network.h
index d897722c94..a5904d93af 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 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 @@ static inline void ff_network_close(void)
 int inet_aton (const char * str, struct in_addr * add);
 #endif
 
-#endif /* FFMPEG_NETWORK_H */
+#endif /* AVFORMAT_NETWORK_H */
diff --git a/libavformat/nut.h b/libavformat/nut.h
index 6acebc34b7..713d27dd3b 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 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 @@ void ff_nut_add_sp(NUTContext *nut, int64_t pos, int64_t back_ptr, int64_t ts);
 
 extern const Dispositions ff_nut_dispositions[];
 
-#endif /* FFMPEG_NUT_H */
+#endif /* AVFORMAT_NUT_H */
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 997acdd4be..93ae444a6b 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -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 const ogg_codec_t ff_vorbis_codec;
 
 extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
 
-#endif /* FFMPEG_OGGDEC_H */
+#endif /* AVFORMAT_OGGDEC_H */
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 34970e3952..2b89fb58e2 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 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 @@ extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
 #endif /* CONFIG_FFSERVER */
 #endif /* CONFIG_NETWORK */
 
-#endif /* FFMPEG_OS_SUPPORT_H */
+#endif /* AVFORMAT_OS_SUPPORT_H */
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index 0c6c44f47e..52c19079e8 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 FFMPEG_QTPALETTE_H
-#define FFMPEG_QTPALETTE_H
+#ifndef AVFORMAT_QTPALETTE_H
+#define AVFORMAT_QTPALETTE_H
 
 #include <inttypes.h>
 
@@ -310,4 +310,4 @@ static const uint8_t ff_qt_default_palette_256[256 * 4] = {
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif /* FFMPEG_QTPALETTE_H */
+#endif /* AVFORMAT_QTPALETTE_H */
diff --git a/libavformat/raw.h b/libavformat/raw.h
index 3d851c829b..ce3e45c932 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 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 */
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 9d36715888..5fdb370d71 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -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 @@ 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 /* FFMPEG_RIFF_H */
+#endif /* AVFORMAT_RIFF_H */
diff --git a/libavformat/rm.h b/libavformat/rm.h
index 2f7f8df2ee..802af74775 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 FFMPEG_RM_H
-#define FFMPEG_RM_H
+#ifndef AVFORMAT_RM_H
+#define AVFORMAT_RM_H
 
 #include "avformat.h"
 
@@ -105,4 +105,4 @@ int ff_rm_parse_packet (AVFormatContext *s, AVStream *st, int len,
  */
 void ff_rm_retrieve_cache (AVFormatContext *s, AVStream *st, AVPacket *pkt);
 
-#endif /* FFMPEG_RM_H */
+#endif /* AVFORMAT_RM_H */
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index 36affed420..0eb95653cb 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 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 @@ typedef enum {
 } rtcp_sdes_type_t;
 #endif
 
-#endif /* FFMPEG_RTP_H */
+#endif /* AVFORMAT_RTP_H */
diff --git a/libavformat/rtp_aac.h b/libavformat/rtp_aac.h
index 24b41cc425..df83d42427 100644
--- a/libavformat/rtp_aac.h
+++ b/libavformat/rtp_aac.h
@@ -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 */
diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h
index 0f23e525cc..07c4b5ef4b 100644
--- a/libavformat/rtp_h264.h
+++ b/libavformat/rtp_h264.h
@@ -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 */
diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index c34212dc16..dbf192c568 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 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 @@ enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
 
 void av_register_rtp_dynamic_payload_handlers(void);
 
-#endif /* FFMPEG_RTP_INTERNAL_H */
+#endif /* AVFORMAT_RTP_INTERNAL_H */
 
diff --git a/libavformat/rtp_mpv.h b/libavformat/rtp_mpv.h
index 36e649a891..378765a546 100644
--- a/libavformat/rtp_mpv.h
+++ b/libavformat/rtp_mpv.h
@@ -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 */
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index 1923acbbc8..537d4bf333 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 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 @@ extern int rtsp_rtp_port_max;
 int rtsp_pause(AVFormatContext *s);
 int rtsp_resume(AVFormatContext *s);
 
-#endif /* FFMPEG_RTSP_H */
+#endif /* AVFORMAT_RTSP_H */
diff --git a/libavformat/rtspcodes.h b/libavformat/rtspcodes.h
index d4ad25b76f..9ee96bfcd0 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 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_SERVICE         =503, /**< Service Unavailable */
 RTSP_STATUS_VERSION         =505, /**< RTSP Version not supported */
 };
 
-#endif /* FFMPEG_RTSPCODES_H */
+#endif /* AVFORMAT_RTSPCODES_H */
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 4ae2b90ef3..a138987ca4 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -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 @@ static const AVCodecTag swf_audio_codec_tags[] = {
     {0, 0},
 };
 
-#endif /* FFMPEG_SWF_H */
+#endif /* AVFORMAT_SWF_H */
diff --git a/libavformat/voc.h b/libavformat/voc.h
index 5f6998a034..0e8aa61af3 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 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 @@ extern const AVCodecTag ff_voc_codec_tags[];
 int voc_get_packet(AVFormatContext *s, AVPacket *pkt,
                    AVStream *st, int max_size);
 
-#endif /* FFMPEG_VOC_H */
+#endif /* AVFORMAT_VOC_H */