[FFmpeg-devel] [PATCH] lavf: make ff_guidcmp inline and move it to asf.h

[Anton Khirnov]

---
 libavformat/asf.c    |    1 -
 libavformat/asf.h    |    5 ++++-
 libavformat/asfdec.c |    5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 1f6af18..4113d10 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -20,7 +20,6 @@
 
 #include "asf.h"
 
-
 const ff_asf_guid ff_asf_header = {
     0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
 };
diff --git a/libavformat/asf.h b/libavformat/asf.h
index f336c43..2408a14 100644
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -230,7 +230,10 @@ 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)) \
-- 
1.7.2.3