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

Anton Khirnov committed 15 years ago

Commit b9afb041 parent a97b9322 files · +6 −6Browse files

Unified · Split

2 files

libavformat/asf.h +6 −1
libavformat/asfdec.c +0 −5

libavformat/asf.h+6−1

@@ -230,7 +230,12 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; · 229 unmodified lines
230	230	#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
231	231
232	232	extern AVInputFormat ff_asf_demuxer;
233		−int ff_guidcmp(const void g1, const void g2);
	233	+
	234	+static av_always_inline int ff_guidcmp(const void g1, const void g2)
	235	+{
	236	+ return memcmp(g1, g2, sizeof(ff_asf_guid));
	237	+}
	238	+
234	239	void ff_get_guid(ByteIOContext s, ff_asf_guid g);
235	240
236	241	#endif /* AVFORMAT_ASF_H */

libavformat/asfdec.c+0−5

@@ -49,11 +49,6 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ · 48 unmodified lines
49	49	/**********************************/
50	50	/* decoding */
51	51
52		−int ff_guidcmp(const void g1, const void g2)
53		−{
54		− return memcmp(g1, g2, sizeof(ff_asf_guid));
55		−}
56		−
57	52	#ifdef DEBUG
58	53	#define PRINT_IF_GUID(g,cmp) \
59	54	if (!ff_guidcmp(g, &cmp)) \