diff --git a/libavformat/wtv.c b/libavformat/wtv.c index 071546a54b..926f924520 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -22,24 +22,24 @@ #include "wtv.h" /* WTV GUIDs*/ -const ff_asf_guid dir_entry_guid = +const ff_asf_guid ff_dir_entry_guid = {0x92,0xB7,0x74,0x91,0x59,0x70,0x70,0x44,0x88,0xDF,0x06,0x3B,0x82,0xCC,0x21,0x3D}; -const ff_asf_guid wtv_guid = +const ff_asf_guid ff_wtv_guid = {0xB7,0xD8,0x00,0x20,0x37,0x49,0xDA,0x11,0xA6,0x4E,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; -const ff_asf_guid timestamp_guid = +const ff_asf_guid ff_timestamp_guid = {0x5B,0x05,0xE6,0x1B,0x97,0xA9,0x49,0x43,0x88,0x17,0x1A,0x65,0x5A,0x29,0x8A,0x97}; -const ff_asf_guid data_guid = +const ff_asf_guid ff_data_guid = {0x95,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; -const ff_asf_guid stream_guid = +const ff_asf_guid ff_stream_guid = {0xED,0xA4,0x13,0x23,0x2D,0xBF,0x4F,0x45,0xAD,0x8A,0xD9,0x5B,0xA7,0xF9,0x1F,0xEE}; -const ff_asf_guid mediatype_audio = +const ff_asf_guid ff_mediatype_audio = {'a','u','d','s',FF_MEDIASUBTYPE_BASE_GUID}; -const ff_asf_guid mediatype_video = +const ff_asf_guid ff_mediatype_video = {'v','i','d','s',FF_MEDIASUBTYPE_BASE_GUID}; -const ff_asf_guid format_none = +const ff_asf_guid ff_format_none = {0xD6,0x17,0x64,0x0F,0x18,0xC3,0xD0,0x11,0xA4,0x3F,0x00,0xA0,0xC9,0x22,0x31,0x96}; -const AVCodecGuid video_guids[] = { +const AVCodecGuid ff_video_guids[] = { {CODEC_ID_MPEG2VIDEO, {0x26,0x80,0x6D,0xE0,0x46,0xDB,0xCF,0x11,0xB4,0xD1,0x00,0x80,0x5F,0x6C,0xBB,0xEA}}, {CODEC_ID_NONE} }; diff --git a/libavformat/wtv.h b/libavformat/wtv.h index 52c17b4363..252804d602 100644 --- a/libavformat/wtv.h +++ b/libavformat/wtv.h @@ -29,13 +29,13 @@ #define WTV_SECTOR_SIZE (1 << WTV_SECTOR_BITS) #define WTV_BIGSECTOR_BITS 18 -extern const ff_asf_guid dir_entry_guid; -extern const ff_asf_guid wtv_guid; -extern const ff_asf_guid timestamp_guid; -extern const ff_asf_guid data_guid; -extern const ff_asf_guid stream_guid; -extern const ff_asf_guid mediatype_audio; -extern const ff_asf_guid mediatype_video; -extern const ff_asf_guid format_none; -extern const AVCodecGuid video_guids[]; +extern const ff_asf_guid ff_dir_entry_guid; +extern const ff_asf_guid ff_wtv_guid; +extern const ff_asf_guid ff_timestamp_guid; +extern const ff_asf_guid ff_data_guid; +extern const ff_asf_guid ff_stream_guid; +extern const ff_asf_guid ff_mediatype_audio; +extern const ff_asf_guid ff_mediatype_video; +extern const ff_asf_guid ff_format_none; +extern const AVCodecGuid ff_video_guids[]; #endif /* AVFORMAT_WTV_H */ diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index f2f76dbe33..c775dfba2e 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -252,7 +252,7 @@ static AVIOContext * wtvfile_open2(AVFormatContext *s, const uint8_t *buf, int b int dir_length, name_size, first_sector, depth; uint64_t file_length; const uint8_t *name; - if (ff_guidcmp(buf, dir_entry_guid)) { + if (ff_guidcmp(buf, ff_dir_entry_guid)) { av_log(s, AV_LOG_ERROR, "unknown guid "FF_PRI_GUID", expected dir_entry_guid; " "remaining directory entries ignored\n", FF_ARG_GUID(buf)); break; @@ -375,7 +375,7 @@ static const ff_asf_guid format_mpeg2_video = static int read_probe(AVProbeData *p) { - return ff_guidcmp(p->buf, wtv_guid) ? 0 : AVPROBE_SCORE_MAX; + return ff_guidcmp(p->buf, ff_wtv_guid) ? 0 : AVPROBE_SCORE_MAX; } /** @@ -613,7 +613,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, st = parse_media_type(s, st, sid, mediatype, actual_subtype, actual_formattype, size - 32); avio_skip(pb, 32); return st; - } else if (!ff_guidcmp(mediatype, mediatype_audio)) { + } else if (!ff_guidcmp(mediatype, ff_mediatype_audio)) { st = new_stream(s, st, sid, AVMEDIA_TYPE_AUDIO); if (!st) return NULL; @@ -622,7 +622,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, if (ret < 0) return NULL; } else { - if (ff_guidcmp(formattype, format_none)) + if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); } @@ -640,7 +640,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype)); } return st; - } else if (!ff_guidcmp(mediatype, mediatype_video)) { + } else if (!ff_guidcmp(mediatype, ff_mediatype_video)) { st = new_stream(s, st, sid, AVMEDIA_TYPE_VIDEO); if (!st) return NULL; @@ -651,7 +651,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, int consumed = parse_videoinfoheader2(s, st); avio_skip(pb, FFMAX(size - consumed, 0)); } else { - if (ff_guidcmp(formattype, format_none)) + if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); } @@ -659,7 +659,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, if (!memcmp(subtype + 4, (const uint8_t[]){FF_MEDIASUBTYPE_BASE_GUID}, 12)) { st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, AV_RL32(subtype)); } else { - st->codec->codec_id = ff_codec_guid_get_id(video_guids, subtype); + st->codec->codec_id = ff_codec_guid_get_id(ff_video_guids, subtype); } if (st->codec->codec_id == CODEC_ID_NONE) av_log(s, AV_LOG_WARNING, "unknown subtype:"FF_PRI_GUID"\n", FF_ARG_GUID(subtype)); @@ -669,7 +669,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, st = new_stream(s, st, sid, AVMEDIA_TYPE_SUBTITLE); if (!st) return NULL; - if (ff_guidcmp(formattype, format_none)) + if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); st->codec->codec_id = CODEC_ID_DVB_SUBTITLE; @@ -679,14 +679,14 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid, st = new_stream(s, st, sid, AVMEDIA_TYPE_SUBTITLE); if (!st) return NULL; - if (ff_guidcmp(formattype, format_none)) + if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); st->codec->codec_id = CODEC_ID_DVB_TELETEXT; return st; } else if (!ff_guidcmp(mediatype, mediatype_mpeg2_sections) && !ff_guidcmp(subtype, mediasubtype_mpeg2_sections)) { - if (ff_guidcmp(formattype, format_none)) + if (ff_guidcmp(formattype, ff_format_none)) av_log(s, AV_LOG_WARNING, "unknown formattype:"FF_PRI_GUID"\n", FF_ARG_GUID(formattype)); avio_skip(pb, size); return NULL; @@ -727,7 +727,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p avio_skip(pb, 8); consumed = 32; - if (!ff_guidcmp(g, stream_guid)) { + if (!ff_guidcmp(g, ff_stream_guid)) { if (ff_find_stream_index(s, sid) < 0) { ff_asf_guid mediatype, subtype, formattype; int size; @@ -816,7 +816,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p } consumed += 15; } - } else if (!ff_guidcmp(g, timestamp_guid)) { + } else if (!ff_guidcmp(g, ff_timestamp_guid)) { int stream_index = ff_find_stream_index(s, sid); if (stream_index >= 0) { avio_skip(pb, 8); @@ -835,7 +835,7 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p } } } - } else if (!ff_guidcmp(g, data_guid)) { + } else if (!ff_guidcmp(g, ff_data_guid)) { int stream_index = ff_find_stream_index(s, sid); if (mode == SEEK_TO_DATA && stream_index >= 0 && len > 32) { WtvStream *wst = s->streams[stream_index]->priv_data;