diff options
| author | Peter Ross <pross@xvid.org> | 2012-11-06 14:01:35 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:51:41 +0100 |
| commit | 1701a22fce3e56618f4fbdd5cce89b8aac3d9d11 (patch) | |
| tree | 4a138bda4d725dcfefbf7cd243aafcc778fdd49c /libavformat | |
| parent | 9632f5efcf48e21c2f3ae3b4168124abb8a8d44a (diff) | |
wtv: rename ff_stream_guid to ff_SBE2_STREAM_DESC_EVENT
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/wtv.c | 2 | ||||
| -rw-r--r-- | libavformat/wtv.h | 2 | ||||
| -rw-r--r-- | libavformat/wtvdec.c | 2 | ||||
| -rw-r--r-- | libavformat/wtvenc.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/wtv.c b/libavformat/wtv.c index d85c3cfc10..40b755cdc2 100644 --- a/libavformat/wtv.c +++ b/libavformat/wtv.c @@ -30,7 +30,7 @@ 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 ff_data_guid = {0x95,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}; -const ff_asf_guid ff_stream_guid = +const ff_asf_guid ff_SBE2_STREAM_DESC_EVENT = {0xED,0xA4,0x13,0x23,0x2D,0xBF,0x4F,0x45,0xAD,0x8A,0xD9,0x5B,0xA7,0xF9,0x1F,0xEE}; const ff_asf_guid ff_mediatype_audio = {'a','u','d','s',FF_MEDIASUBTYPE_BASE_GUID}; diff --git a/libavformat/wtv.h b/libavformat/wtv.h index 7e4f243551..864cc1811c 100644 --- a/libavformat/wtv.h +++ b/libavformat/wtv.h @@ -39,7 +39,7 @@ 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_SBE2_STREAM_DESC_EVENT; extern const ff_asf_guid ff_mediatype_audio; extern const ff_asf_guid ff_mediatype_video; extern const ff_asf_guid ff_format_none; diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 5d82db68b0..60b229f95e 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -741,7 +741,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, ff_stream_guid)) { + if (!ff_guidcmp(g, ff_SBE2_STREAM_DESC_EVENT)) { if (ff_find_stream_index(s, sid) < 0) { ff_asf_guid mediatype, subtype, formattype; int size; diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 419dd57e7a..2629befa79 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -310,7 +310,7 @@ static int write_stream_data(AVFormatContext *s, AVStream *st, int flag) int ret; if (!flag) { - write_chunk_header2(s, &ff_stream_guid, 0x80000000 | (st->index + INDEX_BASE)); + write_chunk_header2(s, &ff_SBE2_STREAM_DESC_EVENT, 0x80000000 | (st->index + INDEX_BASE)); avio_wl32(pb, 0x00000001); avio_wl32(pb, st->index + INDEX_BASE); //stream_id avio_wl32(pb, 0x00000001); |