diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 14:38:05 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 14:38:10 +0100 |
commit | 7766c7b7a0097e257c9070c9ef4275f8ec9b46dc (patch) | |
tree | 3e1552ff53c97309fa7e2e19ccabfd2269201c14 /libavcodec/arm | |
parent | 194ef56ba7e659196fe554782d797b1b45c3915f (diff) | |
parent | 7151c5d04aed3b496c21f713dcb603e2cbdb9c49 (diff) |
Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49':
arm: Use full filenames as multiple inclusion guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/dsputil_arm.h | 6 | ||||
-rw-r--r-- | libavcodec/arm/hpeldsp_arm.h | 6 | ||||
-rw-r--r-- | libavcodec/arm/mpegvideo_arm.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/arm/dsputil_arm.h b/libavcodec/arm/dsputil_arm.h index b7b5bdc0e6..dfa01ba80e 100644 --- a/libavcodec/arm/dsputil_arm.h +++ b/libavcodec/arm/dsputil_arm.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ARM_DSPUTIL_H -#define AVCODEC_ARM_DSPUTIL_H +#ifndef AVCODEC_ARM_DSPUTIL_ARM_H +#define AVCODEC_ARM_DSPUTIL_ARM_H #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" @@ -29,4 +29,4 @@ void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_vfp(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx); -#endif /* AVCODEC_ARM_DSPUTIL_H */ +#endif /* AVCODEC_ARM_DSPUTIL_ARM_H */ diff --git a/libavcodec/arm/hpeldsp_arm.h b/libavcodec/arm/hpeldsp_arm.h index 3f18c624d8..5f3c7741c1 100644 --- a/libavcodec/arm/hpeldsp_arm.h +++ b/libavcodec/arm/hpeldsp_arm.h @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ARM_HPELDSP_H -#define AVCODEC_ARM_HPELDSP_H +#ifndef AVCODEC_ARM_HPELDSP_ARM_H +#define AVCODEC_ARM_HPELDSP_ARM_H #include "libavcodec/hpeldsp.h" void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags); void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags); -#endif /* AVCODEC_ARM_HPELDSP_H */ +#endif /* AVCODEC_ARM_HPELDSP_ARM_H */ diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/arm/mpegvideo_arm.h index 4ff93b76b9..78e07e15c5 100644 --- a/libavcodec/arm/mpegvideo_arm.h +++ b/libavcodec/arm/mpegvideo_arm.h @@ -16,11 +16,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ARM_MPEGVIDEO_H -#define AVCODEC_ARM_MPEGVIDEO_H +#ifndef AVCODEC_ARM_MPEGVIDEO_ARM_H +#define AVCODEC_ARM_MPEGVIDEO_ARM_H #include "libavcodec/mpegvideo.h" void ff_MPV_common_init_armv5te(MpegEncContext *s); -#endif /* AVCODEC_ARM_MPEGVIDEO_H */ +#endif /* AVCODEC_ARM_MPEGVIDEO_ARM_H */ |