Fix links to ARM documentation

Originally committed as revision 10399 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/optimization.txt b/doc/optimization.txt
index e2a6a5241e5ed7d2a9aa91148cd88723c731c57f..c54eaf8bad3ec7c2909a6a4e7cd7b5e81a6d4e38 100644 (file)
--- a/doc/optimization.txt
+++ b/doc/optimization.txt
@@ -152,11 +152,19 @@ http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/22007.pd
 
 
 ARM-specific:
-ARM Architecture Reference Manual:
-http://www.arm.com/community/academy/resources.html
 
-Instructions timings and optimization guide for ARM9E:
-http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
+ARM Architecture Reference Manual (up to ARMv5TE):
+http://www.arm.com/community/university/eulaarmarm.html
+
+Procedure Call Standard for the ARM Architecture:
+http://www.arm.com/pdfs/aapcs.pdf
+
+Optimization guide for ARM9E (used in Nokia 770 Internet Tablet):
+http://infocenter.arm.com/help/topic/com.arm.doc.ddi0240b/DDI0240A.pdf
+Optimization guide for ARM11 (used in Nokia N800 Internet Tablet):
+http://infocenter.arm.com/help/topic/com.arm.doc.ddi0211j/DDI0211J_arm1136_r1p5_trm.pdf
+Optimization guide for Intel XScale (used in Sharp Zaurus PDA):
+http://download.intel.com/design/intelxscale/27347302.pdf
 
 PowerPC-specific:
 

diff --git a/libavcodec/armv4l/mpegvideo_armv5te.c b/libavcodec/armv4l/mpegvideo_armv5te.c
index e6acf1115ee86dda45a080c561672f7650c3a69a..4322b19f2ff55b4cb249a762f6fea9f84733f1b3 100644 (file)
--- a/libavcodec/armv4l/mpegvideo_armv5te.c
+++ b/libavcodec/armv4l/mpegvideo_armv5te.c
@@ -19,12 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
- * Some useful links for those who may be interested in optimizing code for ARM.
- * ARM Architecture Reference Manual: http://www.arm.com/community/academy/resources.html
- * Instructions timings and optimization guide for ARM9E: http://www.arm.com/pdfs/DDI0222B_9EJS_r1p2.pdf
- */
-
 #include "dsputil.h"
 #include "mpegvideo.h"
 #include "avcodec.h"