# HG changeset patch # User diego # Date 1210327611 0 # Node ID e6a7be7d85f297b42adafdd954aa50ab8d412251 # Parent 6b7ba5b9af2e4f5368880b7b524f8a01e69d9531 ipp.h is a system header, use <> when #including it. diff -r 6b7ba5b9af2e -r e6a7be7d85f2 armv4l/dsputil_arm.c --- a/armv4l/dsputil_arm.c Fri May 09 09:48:49 2008 +0000 +++ b/armv4l/dsputil_arm.c Fri May 09 10:06:51 2008 +0000 @@ -21,7 +21,7 @@ #include "dsputil.h" #ifdef HAVE_IPP -#include "ipp.h" +#include #endif extern void dsputil_init_iwmmxt(DSPContext* c, AVCodecContext *avctx); diff -r 6b7ba5b9af2e -r e6a7be7d85f2 armv4l/dsputil_iwmmxt.c --- a/armv4l/dsputil_iwmmxt.c Fri May 09 09:48:49 2008 +0000 +++ b/armv4l/dsputil_iwmmxt.c Fri May 09 10:06:51 2008 +0000 @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" +#include "libavcodec/dsputil.h" #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt #define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); diff -r 6b7ba5b9af2e -r e6a7be7d85f2 armv4l/mpegvideo_arm.c --- a/armv4l/mpegvideo_arm.c Fri May 09 09:48:49 2008 +0000 +++ b/armv4l/mpegvideo_arm.c Fri May 09 10:06:51 2008 +0000 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" -#include "mpegvideo.h" -#include "avcodec.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/dsputil.h" +#include "libavcodec/mpegvideo.h" extern void MPV_common_init_iwmmxt(MpegEncContext *s); extern void MPV_common_init_armv5te(MpegEncContext *s); diff -r 6b7ba5b9af2e -r e6a7be7d85f2 armv4l/mpegvideo_armv5te.c --- a/armv4l/mpegvideo_armv5te.c Fri May 09 09:48:49 2008 +0000 +++ b/armv4l/mpegvideo_armv5te.c Fri May 09 10:06:51 2008 +0000 @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" -#include "mpegvideo.h" -#include "avcodec.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/dsputil.h" +#include "libavcodec/mpegvideo.h" #ifdef ENABLE_ARM_TESTS diff -r 6b7ba5b9af2e -r e6a7be7d85f2 armv4l/mpegvideo_iwmmxt.c --- a/armv4l/mpegvideo_iwmmxt.c Fri May 09 09:48:49 2008 +0000 +++ b/armv4l/mpegvideo_iwmmxt.c Fri May 09 10:06:51 2008 +0000 @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" -#include "mpegvideo.h" -#include "avcodec.h" +#include "libavcodec/avcodec.h" +#include "libavcodec/dsputil.h" +#include "libavcodec/mpegvideo.h" static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, DCTELEM *block, int n, int qscale)