diff --git a/libavformat/asf.c b/libavformat/asf.c index bca212b140..2e17554f03 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -21,94 +21,94 @@ #include "asf.h" -const GUID ff_asf_header = { +const ff_asf_guid ff_asf_header = { 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C }; -const GUID ff_asf_file_header = { +const ff_asf_guid ff_asf_file_header = { 0xA1, 0xDC, 0xAB, 0x8C, 0x47, 0xA9, 0xCF, 0x11, 0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }; -const GUID ff_asf_stream_header = { +const ff_asf_guid ff_asf_stream_header = { 0x91, 0x07, 0xDC, 0xB7, 0xB7, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }; -const GUID ff_asf_ext_stream_header = { +const ff_asf_guid ff_asf_ext_stream_header = { 0xCB, 0xA5, 0xE6, 0x14, 0x72, 0xC6, 0x32, 0x43, 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A }; -const GUID ff_asf_audio_stream = { +const ff_asf_guid ff_asf_audio_stream = { 0x40, 0x9E, 0x69, 0xF8, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; -const GUID ff_asf_audio_conceal_none = { +const ff_asf_guid ff_asf_audio_conceal_none = { // 0x40, 0xa4, 0xf1, 0x49, 0x4ece, 0x11d0, 0xa3, 0xac, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 // New value lifted from avifile 0x00, 0x57, 0xfb, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xa8, 0xfd, 0x00, 0x80, 0x5f, 0x5c, 0x44, 0x2b }; -const GUID ff_asf_audio_conceal_spread = { +const ff_asf_guid ff_asf_audio_conceal_spread = { 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 }; -const GUID ff_asf_video_stream = { +const ff_asf_guid ff_asf_video_stream = { 0xC0, 0xEF, 0x19, 0xBC, 0x4D, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; -const GUID ff_asf_video_conceal_none = { +const ff_asf_guid ff_asf_video_conceal_none = { 0x00, 0x57, 0xFB, 0x20, 0x55, 0x5B, 0xCF, 0x11, 0xA8, 0xFD, 0x00, 0x80, 0x5F, 0x5C, 0x44, 0x2B }; -const GUID ff_asf_command_stream = { +const ff_asf_guid ff_asf_command_stream = { 0xC0, 0xCF, 0xDA, 0x59, 0xE6, 0x59, 0xD0, 0x11, 0xA3, 0xAC, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }; -const GUID ff_asf_comment_header = { +const ff_asf_guid ff_asf_comment_header = { 0x33, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }; -const GUID ff_asf_codec_comment_header = { +const ff_asf_guid ff_asf_codec_comment_header = { 0x40, 0x52, 0xD1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6 }; -const GUID ff_asf_codec_comment1_header = { +const ff_asf_guid ff_asf_codec_comment1_header = { 0x41, 0x52, 0xd1, 0x86, 0x1D, 0x31, 0xD0, 0x11, 0xa3, 0xa4, 0x00, 0xa0, 0xc9, 0x03, 0x48, 0xf6 }; -const GUID ff_asf_data_header = { +const ff_asf_guid ff_asf_data_header = { 0x36, 0x26, 0xb2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xa6, 0xd9, 0x00, 0xaa, 0x00, 0x62, 0xce, 0x6c }; -const GUID ff_asf_head1_guid = { +const ff_asf_guid ff_asf_head1_guid = { 0xb5, 0x03, 0xbf, 0x5f, 0x2E, 0xA9, 0xCF, 0x11, 0x8e, 0xe3, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }; -const GUID ff_asf_head2_guid = { +const ff_asf_guid ff_asf_head2_guid = { 0x11, 0xd2, 0xd3, 0xab, 0xBA, 0xA9, 0xCF, 0x11, 0x8e, 0xe6, 0x00, 0xc0, 0x0c, 0x20, 0x53, 0x65 }; -const GUID ff_asf_extended_content_header = { +const ff_asf_guid ff_asf_extended_content_header = { 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 }; -const GUID ff_asf_simple_index_header = { +const ff_asf_guid ff_asf_simple_index_header = { 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB }; -const GUID ff_asf_ext_stream_embed_stream_header = { +const ff_asf_guid ff_asf_ext_stream_embed_stream_header = { 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 }; -const GUID ff_asf_ext_stream_audio_stream = { +const ff_asf_guid ff_asf_ext_stream_audio_stream = { 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 }; -const GUID ff_asf_metadata_header = { +const ff_asf_guid ff_asf_metadata_header = { 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca }; /* I am not a number !!! This GUID is the one found on the PC used to generate the stream */ -const GUID ff_asf_my_guid = { +const ff_asf_guid ff_asf_my_guid = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; diff --git a/libavformat/asf.h b/libavformat/asf.h index a36013bdd2..6d6619dcc8 100644 --- a/libavformat/asf.h +++ b/libavformat/asf.h @@ -44,10 +44,10 @@ typedef struct { } ASFStream; -typedef uint8_t GUID[16]; +typedef uint8_t ff_asf_guid[16]; typedef struct { - GUID guid; ///< generated by client computer + ff_asf_guid guid; ///< generated by client computer uint64_t file_size; /**< in bytes * invalid if broadcasting */ uint64_t create_time; /**< time of creation, in 100-nanosecond units since 1.1.1601 @@ -135,28 +135,28 @@ typedef struct { ASFStream* asf_st; ///< currently decoded stream } ASFContext; -extern const GUID ff_asf_header; -extern const GUID ff_asf_file_header; -extern const GUID ff_asf_stream_header; -extern const GUID ff_asf_ext_stream_header; -extern const GUID ff_asf_audio_stream; -extern const GUID ff_asf_audio_conceal_none; -extern const GUID ff_asf_audio_conceal_spread; -extern const GUID ff_asf_video_stream; -extern const GUID ff_asf_video_conceal_none; -extern const GUID ff_asf_command_stream; -extern const GUID ff_asf_comment_header; -extern const GUID ff_asf_codec_comment_header; -extern const GUID ff_asf_codec_comment1_header; -extern const GUID ff_asf_data_header; -extern const GUID ff_asf_head1_guid; -extern const GUID ff_asf_head2_guid; -extern const GUID ff_asf_extended_content_header; -extern const GUID ff_asf_simple_index_header; -extern const GUID ff_asf_ext_stream_embed_stream_header; -extern const GUID ff_asf_ext_stream_audio_stream; -extern const GUID ff_asf_metadata_header; -extern const GUID ff_asf_my_guid; +extern const ff_asf_guid ff_asf_header; +extern const ff_asf_guid ff_asf_file_header; +extern const ff_asf_guid ff_asf_stream_header; +extern const ff_asf_guid ff_asf_ext_stream_header; +extern const ff_asf_guid ff_asf_audio_stream; +extern const ff_asf_guid ff_asf_audio_conceal_none; +extern const ff_asf_guid ff_asf_audio_conceal_spread; +extern const ff_asf_guid ff_asf_video_stream; +extern const ff_asf_guid ff_asf_video_conceal_none; +extern const ff_asf_guid ff_asf_command_stream; +extern const ff_asf_guid ff_asf_comment_header; +extern const ff_asf_guid ff_asf_codec_comment_header; +extern const ff_asf_guid ff_asf_codec_comment1_header; +extern const ff_asf_guid ff_asf_data_header; +extern const ff_asf_guid ff_asf_head1_guid; +extern const ff_asf_guid ff_asf_head2_guid; +extern const ff_asf_guid ff_asf_extended_content_header; +extern const ff_asf_guid ff_asf_simple_index_header; +extern const ff_asf_guid ff_asf_ext_stream_embed_stream_header; +extern const ff_asf_guid ff_asf_ext_stream_audio_stream; +extern const ff_asf_guid ff_asf_metadata_header; +extern const ff_asf_guid ff_asf_my_guid; extern const AVMetadataConv ff_asf_metadata_conv[]; diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index d0d9d4583f..af0b752c4b 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -34,11 +34,11 @@ void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format); #define FRAME_HEADER_SIZE 17 // Fix Me! FRAME_HEADER_SIZE may be different. -static const GUID index_guid = { +static const ff_asf_guid index_guid = { 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0, 0xc9, 0x03, 0x49, 0xcb }; -static const GUID stream_bitrate_guid = { /* (http://get.to/sdp) */ +static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 }; /**********************************/ @@ -51,7 +51,7 @@ static const GUID stream_bitrate_guid = { /* (http://get.to/sdp) */ if (!guidcmp(g, &cmp)) \ dprintf(NULL, "(GUID: %s) ", #cmp) -static void print_guid(const GUID *g) +static void print_guid(const ff_asf_guid *g) { int i; PRINT_IF_GUID(g, ff_asf_header); @@ -89,10 +89,10 @@ static void print_guid(const GUID *g) static int guidcmp(const void *g1, const void *g2) { - return memcmp(g1, g2, sizeof(GUID)); + return memcmp(g1, g2, sizeof(ff_asf_guid)); } -static void get_guid(ByteIOContext *s, GUID *g) +static void get_guid(ByteIOContext *s, ff_asf_guid *g) { assert(sizeof(*g) == 16); get_buffer(s, *g, sizeof(*g)); @@ -166,7 +166,7 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) { ASFContext *asf = s->priv_data; - GUID g; + ff_asf_guid g; ByteIOContext *pb = s->pb; AVStream *st; ASFStream *asf_st; @@ -984,7 +984,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, static void asf_build_simple_index(AVFormatContext *s, int stream_index) { - GUID g; + ff_asf_guid g; ASFContext *asf = s->priv_data; int64_t gsize, itime; int64_t pos, current_pos, index_pts; diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 8c5aec738f..39b48422a2 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -197,7 +197,7 @@ static const AVCodecTag codec_asf_bmp_tags[] = { #define PREROLL_TIME 3100 -static void put_guid(ByteIOContext *s, const GUID *g) +static void put_guid(ByteIOContext *s, const ff_asf_guid *g) { assert(sizeof(*g) == 16); put_buffer(s, *g, sizeof(*g)); @@ -220,7 +220,7 @@ static void put_str16_nolen(ByteIOContext *s, const char *tag) }while(c); } -static int64_t put_header(ByteIOContext *pb, const GUID *g) +static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g) { int64_t pos;