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

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad7)
oldabi
Anton Khirnov 14 years ago committed by Michael Niedermayer
parent a97b9325cb
commit b9afb0446d
  1. 7
      libavformat/asf.h
  2. 5
      libavformat/asfdec.c

@ -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 */

@ -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)) \

Loading…
Cancel
Save