diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-03-06 09:58:00 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-03-09 18:54:28 +0100 |
| commit | b527dd30e9461b57dff17afe6c8738c3f20d2cb7 (patch) | |
| tree | e5d5fbe99ea482dc4243890c4a73ce652ac63e01 | |
| parent | 9b79a05289d91d1184455d12e6c4df457f0657c4 (diff) | |
| download | ffmpeg-b527dd30e9461b57dff17afe6c8738c3f20d2cb7.tar.gz | |
wmadec: require block_align to be set.
Avoids an infinite loop in the calling programs with decoder not
consuming any input and not returning output.
CC:libav-stable@libav.org
(cherry picked from commit ea1136baafb1fe271cb56c3f4d7bff0267e3c70f)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit c1f479e8df24284237c80ad959619fc85e29a26d)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/wmadec.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index a7300594ca..c88a035336 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -85,6 +85,11 @@ static int wma_decode_init(AVCodecContext * avctx) int i, flags2; uint8_t *extradata; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + s->avctx = avctx; /* extract flag infos */ |