From f00f6d538dcbaa122eb5e2784f41f4a299296b7b Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@gmail.com>
Date: Thu, 10 Sep 2015 20:26:09 +0200
Subject: [PATCH] lavc: Sanitize header inclusion guards

Fix typos, add missing comments, and remove stray lines.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
 libavcodec/dct32.h     | 2 +-
 libavcodec/hqxdsp.h    | 1 -
 libavcodec/mpegutils.h | 2 +-
 libavcodec/pngdsp.h    | 2 +-
 libavcodec/twinvq.h    | 2 +-
 libavcodec/wma_freqs.h | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/dct32.h b/libavcodec/dct32.h
index 110338d25c..8bf6880155 100644
--- a/libavcodec/dct32.h
+++ b/libavcodec/dct32.h
@@ -22,4 +22,4 @@
 void ff_dct32_float(float *dst, const float *src);
 void ff_dct32_fixed(int *dst, const int *src);
 
-#endif
+#endif /* AVCODEC_DCT32_H */
diff --git a/libavcodec/hqxdsp.h b/libavcodec/hqxdsp.h
index 163c1f8ab2..2cd2a8e9a4 100644
--- a/libavcodec/hqxdsp.h
+++ b/libavcodec/hqxdsp.h
@@ -37,4 +37,3 @@ typedef struct HQXDSPContext {
 void ff_hqxdsp_init(HQXDSPContext *c);
 
 #endif /* AVCODEC_HQXDSP_H */
-
diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h
index 5c503fb600..9b5a5767b9 100644
--- a/libavcodec/mpegutils.h
+++ b/libavcodec/mpegutils.h
@@ -132,4 +132,4 @@ void ff_draw_horiz_band(AVCodecContext *avctx, AVFrame *cur, AVFrame *last,
                         int y, int h, int picture_structure, int first_field,
                         int low_delay);
 
-#endif /* AVCODEC_PICTTYPE_H */
+#endif /* AVCODEC_MPEGUTILS_H */
diff --git a/libavcodec/pngdsp.h b/libavcodec/pngdsp.h
index 98d29a8a2f..607fe64fd8 100644
--- a/libavcodec/pngdsp.h
+++ b/libavcodec/pngdsp.h
@@ -37,4 +37,4 @@ typedef struct PNGDSPContext {
 void ff_pngdsp_init(PNGDSPContext *dsp);
 void ff_pngdsp_init_x86(PNGDSPContext *dsp);
 
-#endif /* AVCDODEC_PNGDSP_H */
+#endif /* AVCODEC_PNGDSP_H */
diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h
index 3148069756..3dc0ab46f8 100644
--- a/libavcodec/twinvq.h
+++ b/libavcodec/twinvq.h
@@ -200,4 +200,4 @@ int ff_twinvq_decode_frame(AVCodecContext *avctx, void *data,
 int ff_twinvq_decode_close(AVCodecContext *avctx);
 int ff_twinvq_decode_init(AVCodecContext *avctx);
 
-#endif /* AVCODEC_TWINVQ_DATA_H */
+#endif /* AVCODEC_TWINVQ_H */
diff --git a/libavcodec/wma_freqs.h b/libavcodec/wma_freqs.h
index 415c83b6c5..d40ab65b96 100644
--- a/libavcodec/wma_freqs.h
+++ b/libavcodec/wma_freqs.h
@@ -23,4 +23,4 @@
 
 extern const uint16_t ff_wma_critical_freqs[25];
 
-#endif /* AVCODEC_WMA_FREQS */
+#endif /* AVCODEC_WMA_FREQS_H */
-- 
GitLab