diff options
| author | Peter Ross <pross@xvid.org> | 2011-04-05 20:36:46 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-07 17:54:52 +0200 |
| commit | c1309b27d2fc57a18a22336c7812874191b2bdac (patch) | |
| tree | 3628aea39ee059c5d93d1650279159e7b2187092 /libavformat/asf.h | |
| parent | dc4103610520ae70d4989ffe3850dcf4deed54a9 (diff) | |
| download | ffmpeg-c1309b27d2fc57a18a22336c7812874191b2bdac.tar.gz | |
move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/asf.h')
| -rw-r--r-- | libavformat/asf.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/libavformat/asf.h b/libavformat/asf.h index 94c93d2c0f..c3107f4a0c 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -24,6 +24,7 @@ #include <stdint.h> #include "avformat.h" #include "metadata.h" +#include "riff.h" #define PACKET_SIZE 3200 @@ -46,8 +47,6 @@ typedef struct { } ASFStream; -typedef uint8_t ff_asf_guid[16]; - typedef struct { ff_asf_guid guid; ///< generated by client computer uint64_t file_size; /**< in bytes @@ -173,11 +172,4 @@ extern const AVMetadataConv ff_asf_metadata_conv[]; extern AVInputFormat ff_asf_demuxer; -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(AVIOContext *s, ff_asf_guid *g); - #endif /* AVFORMAT_ASF_H */ |