diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:16:57 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 15:16:57 +0200 |
| commit | 95f92b2513342d3122320de6f80ebf8e55a91728 (patch) | |
| tree | 5e189d38e934195af053156da8d2fe2c7c74f681 /libavcodec | |
| parent | 580c4fc98a213ff56ec95f95c30dde81cb7ef46c (diff) | |
| parent | f00f6d538dcbaa122eb5e2784f41f4a299296b7b (diff) | |
| download | ffmpeg-95f92b2513342d3122320de6f80ebf8e55a91728.tar.gz | |
Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'
* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b':
lavc: Sanitize header inclusion guards
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dct32.h | 2 | ||||
| -rw-r--r-- | libavcodec/hqxdsp.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpegutils.h | 2 | ||||
| -rw-r--r-- | libavcodec/pngdsp.h | 2 | ||||
| -rw-r--r-- | libavcodec/twinvq.h | 2 | ||||
| -rw-r--r-- | libavcodec/wma_freqs.h | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/dct32.h b/libavcodec/dct32.h index f4b2471de2..61bf223a8d 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 16a42cc2b5..39ab3e2f38 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 37cc391c23..6ac5cef4fd 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 fbc1a508e7..5475d0d943 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 206eeaaf83..228a4894e2 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 85c5f697b7..6fd93e4eff 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 */ |