ffmpeg | branch: master | Clément Bœsch <clem...@stupeflix.com> | Wed Jun 29 11:42:42 2016 +0200| [9afa64dfdffdf2ce80fc9e7d1e3e0091d0c2eb3b] | committer: Clément Bœsch
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced' * commit '59c6509d9f0236acbc317198eab76dab8320bced': mss2: Drop a silly assert Merged-by: Clément Bœsch <clem...@stupeflix.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9afa64dfdffdf2ce80fc9e7d1e3e0091d0c2eb3b --- libavcodec/mss2.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index d255dd4..1e24568 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -482,9 +482,6 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r; int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask); - av_assert0(AV_INPUT_BUFFER_PADDING_SIZE >= - ARITH2_PADDING + (MIN_CACHE_BITS + 7) / 8); - if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) return ret; ====================================================================== diff --cc libavcodec/mss2.c index d255dd4,866ce47..1e24568 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@@ -482,11 -476,7 +482,8 @@@ static int mss2_decode_frame(AVCodecCon Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r; int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask); - av_assert0(AV_INPUT_BUFFER_PADDING_SIZE >= - ARITH2_PADDING + (MIN_CACHE_BITS + 7) / 8); - - init_get_bits(&gb, buf, buf_size * 8); + if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) + return ret; if (keyframe = get_bits1(&gb)) skip_bits(&gb, 7); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
