ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jul 15 19:51:02 2014 +0200| [5bda0467d284e7f8b15101bbc8b0e417cc4ecb38] | committer: Michael Niedermayer
avcodec/mpegvideo_enc: make edge for interlaced mpeg2 encoding smaller Fixes segfault the size can probably be reduced further for the mpeg2 case Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bda0467d284e7f8b15101bbc8b0e417cc4ecb38 --- libavcodec/mpegvideo_enc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4bb79f6..a4786b4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1146,7 +1146,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) int vpad = 16; if ( s->codec_id == AV_CODEC_ID_MPEG2VIDEO - && !s->progressive_sequence) + && !s->progressive_sequence + && FFALIGN(s->height, 32) - s->height > 16) vpad = 32; if (!s->avctx->rc_buffer_size) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog