avcodec/mjpegenc: disallow encoding amv with height%16!=0
I do not know on which side to place the padding to encode with 16x16 MBs If someone knows or has a known to be correct sample, please contact me Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
149be91374
commit
181b2c3724
@ -539,6 +539,13 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
|
|||||||
if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
|
if(s->avctx->flags & CODEC_FLAG_EMU_EDGE)
|
||||||
return AVERROR(EINVAL);
|
return AVERROR(EINVAL);
|
||||||
|
|
||||||
|
if (avctx->height & 15) {
|
||||||
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Height must be a multiple of 16, also note, "
|
||||||
|
"if you have a AMV sample thats mod 16 != 0, please contact us\n");
|
||||||
|
return AVERROR(EINVAL);
|
||||||
|
}
|
||||||
|
|
||||||
pic = av_frame_clone(pic_arg);
|
pic = av_frame_clone(pic_arg);
|
||||||
if (!pic)
|
if (!pic)
|
||||||
return AVERROR(ENOMEM);
|
return AVERROR(ENOMEM);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user