forked from FFmpeg/FFmpeg
Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'
* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49': arm: Use full filenames as multiple inclusion guards Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7766c7b7a0
3 changed files with 9 additions and 9 deletions
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Add table
Reference in a new issue