diff options
| author | Diego Biurrun <diego@biurrun.de> | 2011-05-17 16:58:04 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2011-05-21 13:48:10 +0200 |
| commit | 153382e1b6b428a1dcb8dc3f06f64a6959d722c5 (patch) | |
| tree | 1ff13033a808528d90b44a288dbf9bcc7c19b34e /libavformat | |
| parent | d49051e0742c09345495ae0486c3601a15222ac4 (diff) | |
| download | ffmpeg-153382e1b6b428a1dcb8dc3f06f64a6959d722c5.tar.gz | |
multiple inclusion guard cleanup
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio_internal.h | 2 | ||||
| -rw-r--r-- | libavformat/ffmeta.h | 6 | ||||
| -rw-r--r-- | libavformat/mms.h | 3 | ||||
| -rw-r--r-- | libavformat/spdif.h | 5 | ||||
| -rw-r--r-- | libavformat/url.h | 2 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
6 files changed, 13 insertions, 7 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 6630aaf61d..1369c43891 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -98,4 +98,4 @@ int ffio_open_dyn_packet_buf(AVIOContext **s, int max_packet_size); */ int ffio_fdopen(AVIOContext **s, URLContext *h); -#endif // AVFORMAT_AVIO_INTERNAL_H +#endif /* AVFORMAT_AVIO_INTERNAL_H */ diff --git a/libavformat/ffmeta.h b/libavformat/ffmeta.h index bce272a087..a5380ca13d 100644 --- a/libavformat/ffmeta.h +++ b/libavformat/ffmeta.h @@ -19,11 +19,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVFORMAT_META_H -#define AVFORMAT_META_H +#ifndef AVFORMAT_FFMETA_H +#define AVFORMAT_FFMETA_H #define ID_STRING ";FFMETADATA" #define ID_CHAPTER "[CHAPTER]" #define ID_STREAM "[STREAM]" -#endif /* AVFORMAT_META_H */ +#endif /* AVFORMAT_FFMETA_H */ diff --git a/libavformat/mms.h b/libavformat/mms.h index 12e9ef0962..36e772c7f9 100644 --- a/libavformat/mms.h +++ b/libavformat/mms.h @@ -60,4 +60,5 @@ typedef struct { int ff_mms_asf_header_parser(MMSContext * mms); int ff_mms_read_data(MMSContext *mms, uint8_t *buf, const int size); int ff_mms_read_header(MMSContext * mms, uint8_t * buf, const int size); -#endif + +#endif /* AVFORMAT_MMS_H */ diff --git a/libavformat/spdif.h b/libavformat/spdif.h index dedb4e8832..b2a6b63be4 100644 --- a/libavformat/spdif.h +++ b/libavformat/spdif.h @@ -19,6 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef AVFORMAT_SPDIF_H +#define AVFORMAT_SPDIF_H + #include <stdint.h> #define SYNCWORD1 0xF872 @@ -55,3 +58,5 @@ static const uint16_t spdif_mpeg_pkt_offset[2][3] = { }; void ff_spdif_bswap_buf16(uint16_t *dst, const uint16_t *src, int w); + +#endif /* AVFORMAT_SPDIF_H */ diff --git a/libavformat/url.h b/libavformat/url.h index c5732c64c6..caafe07cce 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -173,4 +173,4 @@ int ffurl_register_protocol(URLProtocol *protocol, int size); int ff_udp_set_remote_url(URLContext *h, const char *uri); int ff_udp_get_local_port(URLContext *h); -#endif //AVFORMAT_URL_H +#endif /* AVFORMAT_URL_H */ diff --git a/libavformat/version.h b/libavformat/version.h index 22b5dc9791..63f419125b 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -69,4 +69,4 @@ #define FF_API_SDP_CREATE (LIBAVFORMAT_VERSION_MAJOR < 54) #endif -#endif //AVFORMAT_VERSION_H +#endif /* AVFORMAT_VERSION_H */ |