diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:15:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 16:15:08 +0100 |
| commit | 7787a6c7caa0a3bdca3b479286def754e6f56cf0 (patch) | |
| tree | 0a77c8060fd87f6e2a6d0cae72907bcf9d2e5742 /libavcodec/wmadec.c | |
| parent | 6ec0447d3d220bc113a69fac04f8b2a423342479 (diff) | |
| parent | cacad1c058f66558ec727faac3b277d2dee264d4 (diff) | |
| download | ffmpeg-7787a6c7caa0a3bdca3b479286def754e6f56cf0.tar.gz | |
Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'
* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
wmaprodec: require block_align to be set.
wmadec: require block_align to be set.
ivi_common: do not call MC for intra frames when dc_transform is unset
Conflicts:
libavcodec/ivi_common.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
| -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 2774dc9877..ae1a983ad8 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -72,6 +72,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 */ |