From: Andreas Rheinhardt <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavcodec/wmaprodec.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c
index 7f3dc7fd8b..d87ed0433e 100644
--- a/libavcodec/wmaprodec.c
+++ b/libavcodec/wmaprodec.c
@@ -370,14 +370,6 @@ static av_cold int decode_init(WMAProDecodeCtx *s,
AVCodecContext *avctx, int nu
int log2_max_num_subframes;
int num_possible_block_sizes;
- if (avctx->codec_id == AV_CODEC_ID_XMA1 || avctx->codec_id ==
AV_CODEC_ID_XMA2)
- avctx->block_align = 2048;
-
- if (!avctx->block_align) {
- av_log(avctx, AV_LOG_ERROR, "block_align is not set\n");
- return AVERROR(EINVAL);
- }
-
s->avctx = avctx;
init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE);
@@ -603,6 +595,11 @@ static av_cold int wmapro_decode_init(AVCodecContext
*avctx)
{
WMAProDecodeCtx *s = avctx->priv_data;
+ if (!avctx->block_align) {
+ av_log(avctx, AV_LOG_ERROR, "block_align is not set\n");
+ return AVERROR(EINVAL);
+ }
+
return decode_init(s, avctx, 0);
}
@@ -1957,6 +1954,8 @@ static av_cold int xma_decode_init(AVCodecContext *avctx)
XMADecodeCtx *s = avctx->priv_data;
int i, ret, start_channels = 0;
+ avctx->block_align = 2048;
+
if (avctx->ch_layout.nb_channels <= 0 || avctx->extradata_size == 0)
return AVERROR_INVALIDDATA;
--
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
