diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-05-09 10:18:58 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-05-09 10:18:58 +0000 |
| commit | a1fe4604d43ef5930a886e309e61d22a574230f8 (patch) | |
| tree | 951ef1be9f10920277e7dba7a5b4ed3bb022d0dd /libavcodec | |
| parent | 81f46d5ac91a066016a0f09392443070ef1bae14 (diff) | |
| download | ffmpeg-a1fe4604d43ef5930a886e309e61d22a574230f8.tar.gz | |
Revert previous mistaken commit.
Originally committed as revision 13094 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/armv4l/dsputil_iwmmxt.c | 2 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_arm.c | 6 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_armv5te.c | 6 | ||||
| -rw-r--r-- | libavcodec/armv4l/mpegvideo_iwmmxt.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c index 6d824e2a14..63976f4c05 100644 --- a/libavcodec/armv4l/dsputil_iwmmxt.c +++ b/libavcodec/armv4l/dsputil_iwmmxt.c @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" +#include "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 --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c index 1a11d7a0fb..0aca43557b 100644 --- a/libavcodec/armv4l/mpegvideo_arm.c +++ b/libavcodec/armv4l/mpegvideo_arm.c @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" -#include "libavcodec/mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" extern void MPV_common_init_iwmmxt(MpegEncContext *s); extern void MPV_common_init_armv5te(MpegEncContext *s); diff --git a/libavcodec/armv4l/mpegvideo_armv5te.c b/libavcodec/armv4l/mpegvideo_armv5te.c index 721dee5152..52cb8733c7 100644 --- a/libavcodec/armv4l/mpegvideo_armv5te.c +++ b/libavcodec/armv4l/mpegvideo_armv5te.c @@ -19,9 +19,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" -#include "libavcodec/mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" #ifdef ENABLE_ARM_TESTS diff --git a/libavcodec/armv4l/mpegvideo_iwmmxt.c b/libavcodec/armv4l/mpegvideo_iwmmxt.c index 108631f649..42bddc495c 100644 --- a/libavcodec/armv4l/mpegvideo_iwmmxt.c +++ b/libavcodec/armv4l/mpegvideo_iwmmxt.c @@ -18,9 +18,9 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" -#include "libavcodec/mpegvideo.h" +#include "dsputil.h" +#include "mpegvideo.h" +#include "avcodec.h" static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s, DCTELEM *block, int n, int qscale) |