From: Anton Khirnov <anton@khirnov.net>
Date: Wed, 9 Feb 2011 12:27:25 +0000 (+0000)
Subject: asf: make ff_guidcmp inline and move it to asf.h
X-Git-Tag: android-x86-4.4-r1~12310^2~2282
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e4e234fad77daa8628fc56155563248165d51ab4;p=android-x86%2Fexternal-ffmpeg.git

asf: make ff_guidcmp inline and move it to asf.h

Signed-off-by: Mans Rullgard <mans@mansr.com>
---

diff --git a/libavformat/asf.h b/libavformat/asf.h
index f336c43fa3..2a817dddba 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -230,7 +230,12 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
 
 extern AVInputFormat ff_asf_demuxer;
-int ff_guidcmp(const void *g1, const void *g2);
+
+static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
+{
+    return memcmp(g1, g2, sizeof(ff_asf_guid));
+}
+
 void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);
 
 #endif /* AVFORMAT_ASF_H */
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 35e892c439..a73a347a51 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -49,11 +49,6 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
 /**********************************/
 /* decoding */
 
-int ff_guidcmp(const void *g1, const void *g2)
-{
-    return memcmp(g1, g2, sizeof(ff_asf_guid));
-}
-
 #ifdef DEBUG
 #define PRINT_IF_GUID(g,cmp) \
 if (!ff_guidcmp(g, &cmp)) \