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

@@ -230,7 +230,12 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; · 229 unmodified lines
230	#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000	230	#define ASF_PL_FLAG_KEY_FRAME 0x80 //1000 0000
231		231
232	extern AVInputFormat ff_asf_demuxer;	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	void ff_get_guid(ByteIOContext s, ff_asf_guid g);	239	void ff_get_guid(ByteIOContext s, ff_asf_guid g);
235		240
236	#endif /* AVFORMAT_ASF_H */	241	#endif /* AVFORMAT_ASF_H */

 /**********************************/
 /* 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)) \

Keyboard shortcuts