From ec1ed6450620f01197920f1083b285e5c8355377 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Jun 2014 12:28:56 +0200 Subject: [PATCH] avcodec/cljr: require (v)strict -1 to use width %4 != 0 Suggested-by: kurosu Signed-off-by: Michael Niedermayer --- libavcodec/cljr.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c index 8d1d1a0c72..d835870aeb 100644 --- a/libavcodec/cljr.c +++ b/libavcodec/cljr.c @@ -115,6 +115,13 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, { 0xCB2A0000, 0xCB250000 }, }; + if (avctx->width%4 && avctx->strict_std_compliance > FF_COMPLIANCE_UNOFFICIAL) { + av_log(avctx, AV_LOG_ERROR, + "Widths which are not a multiple of 4 might fail with some decoders, " + "use vstrict=-1 / -strict -1 to use %d anyway.\n", avctx->width); + return AVERROR_EXPERIMENTAL; + } + if ((ret = ff_alloc_packet2(avctx, pkt, 32*avctx->height*avctx->width/4)) < 0) return ret;