diff options
| author | Peter Ross <pross@xvid.org> | 2011-04-05 20:36:55 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 17:54:52 +0200 |
| commit | 36ffabc4eeab2e4489e83d874c19b86a4b44d25a (patch) | |
| tree | 6b8da2f83aafaad5511e65315dfe5217dfd53002 /libavformat/riff.h | |
| parent | c1309b27d2fc57a18a22336c7812874191b2bdac (diff) | |
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.h')
| -rw-r--r-- | libavformat/riff.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libavformat/riff.h b/libavformat/riff.h index c8a47e0af7..d5e1cdf7d8 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -56,6 +56,11 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz typedef uint8_t ff_asf_guid[16]; +#define FF_PRI_GUID \ + "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x" +#define FF_ARG_GUID(g) \ + g[0],g[1],g[2],g[3],g[4],g[5],g[6],g[7],g[8],g[9],g[10],g[11],g[12],g[13],g[14],g[15] + static av_always_inline int ff_guidcmp(const void *g1, const void *g2) { return memcmp(g1, g2, sizeof(ff_asf_guid)); @@ -63,4 +68,16 @@ static av_always_inline int ff_guidcmp(const void *g1, const void *g2) void ff_get_guid(AVIOContext *s, ff_asf_guid *g); +typedef struct { + enum CodecID id; + ff_asf_guid guid; +} AVCodecGuid; + +enum CodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid); + +extern const AVCodecGuid ff_codec_wav_guids[]; + +#define FF_MEDIASUBTYPE_BASE_GUID \ + 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71 + #endif /* AVFORMAT_RIFF_H */ |