diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-18 14:03:40 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-03-18 14:03:40 +0000 |
| commit | b8b00d9429a2f3641d582100a924c64e6c39e1c0 (patch) | |
| tree | b9f5799bce62f138850a34da453cfce8cf346674 /libavformat/asf.h | |
| parent | f650e4d34a9b45c49e287a73ed1e0b72d1cad42f (diff) | |
Rename GUID typedef to ff_asf_guid to fix MinGW compilation failure
(GUID is also defined, but differently, in Windows headers).
Originally committed as revision 18032 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.h')
| -rw-r--r-- | libavformat/asf.h | 48 |
1 files changed, 24 insertions, 24 deletions
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[]; |