RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-11 03:32:39 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e4e234fad7)
This commit is contained in:
Anton Khirnov 2011-02-09 12:27:25 +00:00 committed by Michael Niedermayer
parent a97b9325cb
commit b9afb0446d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/asf.h
View File

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

5
libavformat/asfdec.c
View File

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