diff options
| author | Peter Ross <pross@xvid.org> | 2012-11-06 14:01:42 +1100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:52:33 +0100 |
| commit | e6ef628b1efb96d21e755a3750bb58d8042884ad (patch) | |
| tree | 75b05d29b9c24fe19dce712de092613a93f8db79 /libavformat/wtvdec.c | |
| parent | 1701a22fce3e56618f4fbdd5cce89b8aac3d9d11 (diff) | |
| download | android_external_ffmpeg-e6ef628b1efb96d21e755a3750bb58d8042884ad.tar.gz android_external_ffmpeg-e6ef628b1efb96d21e755a3750bb58d8042884ad.tar.bz2 android_external_ffmpeg-e6ef628b1efb96d21e755a3750bb58d8042884ad.zip | |
wtv: move duplicated guids into wtv.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/wtvdec.c')
| -rw-r--r-- | libavformat/wtvdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 60b229f95e..c030ab6d69 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -879,9 +879,9 @@ static int parse_chunks(AVFormatContext *s, int mode, int64_t seekts, int *len_p !ff_guidcmp(g, (const ff_asf_guid){0x4E,0x7F,0x4C,0x5B,0xC4,0xD0,0x38,0x4B,0xA8,0x3E,0x21,0x7F,0x7B,0xBF,0x52,0xE7}) || !ff_guidcmp(g, (const ff_asf_guid){0x63,0x36,0xEB,0xFE,0xA1,0x7E,0xD9,0x11,0x83,0x08,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) || !ff_guidcmp(g, (const ff_asf_guid){0x70,0xE9,0xF1,0xF8,0x89,0xA4,0x4C,0x4D,0x83,0x73,0xB8,0x12,0xE0,0xD5,0xF8,0x1E}) || - !ff_guidcmp(g, (const ff_asf_guid){0x96,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) || - !ff_guidcmp(g, (const ff_asf_guid){0x97,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) || - !ff_guidcmp(g, (const ff_asf_guid){0xA1,0xC3,0xD2,0xC2,0x7E,0x9A,0xDA,0x11,0x8B,0xF7,0x00,0x07,0xE9,0x5E,0xAD,0x8D}) || + !ff_guidcmp(g, ff_index_guid) || + !ff_guidcmp(g, ff_sync_guid) || + !ff_guidcmp(g, ff_stream1_guid) || !ff_guidcmp(g, (const ff_asf_guid){0xF7,0x10,0x02,0xB9,0xEE,0x7C,0xED,0x4E,0xBD,0x7F,0x05,0x40,0x35,0x86,0x18,0xA1})) { //ignore known guids } else |