diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:42:42 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-29 11:42:42 +0200 |
| commit | 9afa64dfdffdf2ce80fc9e7d1e3e0091d0c2eb3b (patch) | |
| tree | e91a05b1bc184ca869232a4d5e038634fc7dbb57 /libavcodec | |
| parent | f755aa5ebdb8cbc036dd7841d2574906b7ce4195 (diff) | |
| parent | 59c6509d9f0236acbc317198eab76dab8320bced (diff) | |
| download | ffmpeg-9afa64dfdffdf2ce80fc9e7d1e3e0091d0c2eb3b.tar.gz | |
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
* commit '59c6509d9f0236acbc317198eab76dab8320bced':
mss2: Drop a silly assert
Merged-by: Clément Bœsch <clement@stupeflix.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mss2.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index d255dd4337..1e24568128 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; |