Commit b9afb044 authored by Anton Khirnov's avatar Anton Khirnov Committed by Michael Niedermayer

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

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fa)
parent a97b9325
...@@ -230,7 +230,12 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; ...@@ -230,7 +230,12 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000 #define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
extern AVInputFormat ff_asf_demuxer; 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); void ff_get_guid(ByteIOContext *s, ff_asf_guid *g);
#endif /* AVFORMAT_ASF_H */ #endif /* AVFORMAT_ASF_H */
...@@ -49,11 +49,6 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ ...@@ -49,11 +49,6 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */
/**********************************/ /**********************************/
/* decoding */ /* decoding */
int ff_guidcmp(const void *g1, const void *g2)
{
return memcmp(g1, g2, sizeof(ff_asf_guid));
}
#ifdef DEBUG #ifdef DEBUG
#define PRINT_IF_GUID(g,cmp) \ #define PRINT_IF_GUID(g,cmp) \
if (!ff_guidcmp(g, &cmp)) \ if (!ff_guidcmp(g, &cmp)) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment