Commit 7766c7b7 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7151c5d0'

* commit '7151c5d0':
  arm: Use full filenames as multiple inclusion guards
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 194ef56b 7151c5d0
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_ARM_DSPUTIL_H #ifndef AVCODEC_ARM_DSPUTIL_ARM_H
#define AVCODEC_ARM_DSPUTIL_H #define AVCODEC_ARM_DSPUTIL_ARM_H
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h" #include "libavcodec/dsputil.h"
...@@ -29,4 +29,4 @@ void ff_dsputil_init_armv6(DSPContext* c, AVCodecContext *avctx); ...@@ -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_vfp(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx); void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx);
#endif /* AVCODEC_ARM_DSPUTIL_H */ #endif /* AVCODEC_ARM_DSPUTIL_ARM_H */
...@@ -18,12 +18,12 @@ ...@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_ARM_HPELDSP_H #ifndef AVCODEC_ARM_HPELDSP_ARM_H
#define AVCODEC_ARM_HPELDSP_H #define AVCODEC_ARM_HPELDSP_ARM_H
#include "libavcodec/hpeldsp.h" #include "libavcodec/hpeldsp.h"
void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags); void ff_hpeldsp_init_armv6(HpelDSPContext *c, int flags);
void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags); void ff_hpeldsp_init_neon(HpelDSPContext *c, int flags);
#endif /* AVCODEC_ARM_HPELDSP_H */ #endif /* AVCODEC_ARM_HPELDSP_ARM_H */
...@@ -16,11 +16,11 @@ ...@@ -16,11 +16,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef AVCODEC_ARM_MPEGVIDEO_H #ifndef AVCODEC_ARM_MPEGVIDEO_ARM_H
#define AVCODEC_ARM_MPEGVIDEO_H #define AVCODEC_ARM_MPEGVIDEO_ARM_H
#include "libavcodec/mpegvideo.h" #include "libavcodec/mpegvideo.h"
void ff_MPV_common_init_armv5te(MpegEncContext *s); void ff_MPV_common_init_armv5te(MpegEncContext *s);
#endif /* AVCODEC_ARM_MPEGVIDEO_H */ #endif /* AVCODEC_ARM_MPEGVIDEO_ARM_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment