diff options
| author | Peter Ross <pross@xvid.org> | 2013-04-20 13:36:45 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-21 18:20:30 +0200 |
| commit | e544782623caf1eb4b2429e9c4f35d6b627accba (patch) | |
| tree | f60545cdf524f0db3b0e4675c5b96962dc3aac9a /libavformat/asf.h | |
| parent | 8e329dba378cef0ff6400c7df9c51da167d5a1f0 (diff) | |
| download | ffmpeg-e544782623caf1eb4b2429e9c4f35d6b627accba.tar.gz | |
riff: Move guid structs and helper functions into riff
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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 3aada8b101..6d418e834d 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 @@ -48,8 +49,6 @@ typedef struct ASFStream { uint32_t palette[256]; } ASFStream; -typedef uint8_t ff_asf_guid[16]; - typedef struct ASFMainHeader { ff_asf_guid guid; ///< generated by client computer uint64_t file_size; /**< in bytes @@ -176,11 +175,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 */ |