mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
Merge commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b'
* commit 'f00f6d538dcbaa122eb5e2784f41f4a299296b7b': lavc: Sanitize header inclusion guards Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
95f92b2513
@ -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 */
|
||||
|
@ -37,4 +37,3 @@ typedef struct HQXDSPContext {
|
||||
void ff_hqxdsp_init(HQXDSPContext *c);
|
||||
|
||||
#endif /* AVCODEC_HQXDSP_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 */
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
@ -23,4 +23,4 @@
|
||||
|
||||
extern const uint16_t ff_wma_critical_freqs[25];
|
||||
|
||||
#endif /* AVCODEC_WMA_FREQS */
|
||||
#endif /* AVCODEC_WMA_FREQS_H */
|
||||
|
Loading…
Reference in New Issue
Block a user