aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Chick <chick@computergeek.freeserve.co.uk>2007-03-23 00:05:45 +0000
committerMåns Rullgård <mans@mansr.com>2007-03-23 00:05:45 +0000
commit56cc42664a23bc15c1d581a5ad30098ac188369e (patch)
treebefd041aebec60a67b9ac155565a7b08d30ff893
parent8ec04d344ad6c832f1c060e7b62148bd0dc29ed1 (diff)
downloadffmpeg-56cc42664a23bc15c1d581a5ad30098ac188369e.tar.gz
iwmmxt ffmpeg code does not implement dct_unquantize_h263_inter_iwmmxt, but
armv5t does - use the armv5t function rather than default c code. patch by Tim Chick chick at computergeek freeserve co uk Originally committed as revision 8487 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/armv4l/mpegvideo_arm.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/libavcodec/armv4l/mpegvideo_arm.c b/libavcodec/armv4l/mpegvideo_arm.c
index ca972e6ed8..22d40d8bcf 100644
--- a/libavcodec/armv4l/mpegvideo_arm.c
+++ b/libavcodec/armv4l/mpegvideo_arm.c
@@ -28,9 +28,14 @@ extern void MPV_common_init_armv5te(MpegEncContext *s);
void MPV_common_init_armv4l(MpegEncContext *s)
{
+ /* IWMMXT support is a superset of armv5te, so
+ * allow optimised functions for armv5te unless
+ * a better iwmmxt function exists
+ */
+#ifdef HAVE_ARMV5TE
+ MPV_common_init_armv5te(s);
+#endif
#ifdef HAVE_IWMMXT
MPV_common_init_iwmmxt(s);
-#elif defined(HAVE_ARMV5TE)
- MPV_common_init_armv5te(s);
#endif
}