[FFmpeg-cvslog] asf: make ff_guidcmp inline and move it to asf.h

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed Feb  9 12:27:25 2011 +0000| [b9afb0446d37bfecc85600b49ca125a6af6a67a0] | committer: Michael Niedermayer

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

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit e4e234fad77daa8628fc56155563248165d51ab4)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b9afb0446d37bfecc85600b49ca125a6af6a67a0
---

 libavformat/asf.h    |    7 ++++++-
 libavformat/asfdec.c |    5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavformat/asf.h b/libavformat/asf.h
index f336c43..2a817dd 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 35e892c..a73a347 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)) \