diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-25 17:37:17 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-10-25 17:37:17 +0100 |
| commit | 6498b34bba8cf6bde4d7a9c9ea045ae1b8be106e (patch) | |
| tree | fa049307ef2b7a76e74c0b85025503224dcffd9a | |
| parent | 65ffca9f803a65057ac6391459b70aa0fa066d80 (diff) | |
| download | ffmpeg-6498b34bba8cf6bde4d7a9c9ea045ae1b8be106e.tar.gz | |
lavf/xwma: Support wmapro.
Fixes ticket #4963.
| -rw-r--r-- | libavformat/xwma.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 9edad7d75a..d516b767f7 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -85,7 +85,8 @@ static int xwma_read_header(AVFormatContext *s) * extradata for that. Thus, ask the user for feedback, but try to go on * anyway. */ - if (st->codec->codec_id != AV_CODEC_ID_WMAV2) { + if (st->codec->codec_id != AV_CODEC_ID_WMAV2 && + st->codec->codec_id != AV_CODEC_ID_WMAPRO) { avpriv_request_sample(s, "Unexpected codec (tag 0x04%x; id %d)", st->codec->codec_tag, st->codec->codec_id); } else { @@ -103,6 +104,13 @@ static int xwma_read_header(AVFormatContext *s) */ avpriv_request_sample(s, "Unexpected extradata (%d bytes)", st->codec->extradata_size); + } else if (st->codec->codec_id == AV_CODEC_ID_WMAPRO) { + if (ff_alloc_extradata(st->codec, 18)) + return AVERROR(ENOMEM); + + memset(st->codec->extradata, 0, st->codec->extradata_size); + st->codec->extradata[ 0] = st->codec->bits_per_coded_sample; + st->codec->extradata[14] = 224; } else { if (ff_alloc_extradata(st->codec, 6)) return AVERROR(ENOMEM); |