[SCM] libav/experimental: Fix illegal identifier, __ are reserved for the system.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9f879620be67bd94778267ee21802ba1154e584f
Author: Diego Biurrun <diego at biurrun.de>
Date:   Mon Nov 3 21:59:35 2008 +0000

    Fix illegal identifier, __ are reserved for the system.
    
    Originally committed as revision 15771 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/armv4l/mathops.h b/libavcodec/armv4l/mathops.h
index e680dce..cf1eaf0 100644
--- a/libavcodec/armv4l/mathops.h
+++ b/libavcodec/armv4l/mathops.h
@@ -77,9 +77,9 @@ static inline av_const int64_t MAC64(int64_t d, int a, int b)
         __asm__ ("smlabb %0, %2, %3, %0" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));
 /* signed 16x16 -> 32 multiply */
 #   define MUL16(ra, rb)                                                \
-        ({ int __rt;                                                    \
-         __asm__ ("smulbb %0, %1, %2" : "=r" (__rt) : "r" (ra), "r" (rb));  \
-         __rt; })
+        ({ int rt;                                                    \
+         __asm__ ("smulbb %0, %1, %2" : "=r" (rt) : "r" (ra), "r" (rb));  \
+         rt; })
 
 #endif
 

-- 
Libav/FFmpeg packaging