ffmpeg | branch: master | Thierry Foucu <tfo...@gmail.com> | Thu Feb 16 14:03:38 2017 +0100| [4bc7268f2b5fdef03b907279b4e6173cb0e5b835] | committer: Carl Eugen Hoyos
lavf/riff: Support decoding files with broken mediasubtype base guid. Fixes ticket #6100. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bc7268f2b5fdef03b907279b4e6173cb0e5b835 --- libavformat/riff.h | 2 ++ libavformat/riffdec.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libavformat/riff.h b/libavformat/riff.h index fe87e81..d30d793 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -109,6 +109,8 @@ extern const AVCodecGuid ff_codec_wav_guids[]; 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 #define FF_AMBISONIC_BASE_GUID \ 0x21, 0x07, 0xD3, 0x11, 0x86, 0x44, 0xC8, 0xC1, 0xCA, 0x00, 0x00, 0x00 +#define FF_BROKEN_BASE_GUID \ + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA static av_always_inline int ff_guidcmp(const void *g1, const void *g2) { diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 42d9b4a..656a9eb 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -72,6 +72,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecParameters *par) if (!memcmp(subformat + 4, (const uint8_t[]){ FF_AMBISONIC_BASE_GUID }, 12) || !memcmp(subformat + 4, + (const uint8_t[]){ FF_BROKEN_BASE_GUID }, 12) || + !memcmp(subformat + 4, (const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) { par->codec_tag = AV_RL32(subformat); par->codec_id = ff_wav_codec_get_id(par->codec_tag, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
