[SCM] libav/experimental: ARM: add some assembler convenience macros

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c72ab301888952c317030f631c70a16ec83d800f
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Oct 27 00:25:06 2008 +0000

    ARM: add some assembler convenience macros
    
    Originally committed as revision 15724 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bmp.h b/libavcodec/armv4l/asm.S
similarity index 67%
copy from libavcodec/bmp.h
copy to libavcodec/armv4l/asm.S
index b24a1fa..e2595f4 100644
--- a/libavcodec/bmp.h
+++ b/libavcodec/armv4l/asm.S
@@ -1,6 +1,5 @@
 /*
- * internals for BMP codecs
- * Copyright (c) 2005 Mans Rullgard
+ * Copyright (c) 2008 Mans Rullgard <mans at mansr.com>
  *
  * This file is part of FFmpeg.
  *
@@ -19,20 +18,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVCODEC_BMP_H
-#define AVCODEC_BMP_H
+        .macro require8, val=1
+        .eabi_attribute 24, \val
+        .endm
 
-#include "avcodec.h"
+        .macro preserve8, val=1
+        .eabi_attribute 25, \val
+        .endm
 
-typedef struct BMPContext {
-    AVFrame picture;
-} BMPContext;
-
-typedef enum {
-    BMP_RGB         =0,
-    BMP_RLE8        =1,
-    BMP_RLE4        =2,
-    BMP_BITFIELDS   =3,
-} BiCompression;
-
-#endif /* AVCODEC_BMP_H */
+        .macro function name, export=0
+.if \export
+        .global \name
+.endif
+        .type   \name, %function
+        .func   \name
+\name:
+        .endm

-- 
Libav/FFmpeg packaging