[FFmpeg-devel] [PATCH] snow: remove strange av_assert2

[Andreas Cadhalpun]

On 10.07.2015 01:48, Michael Niedermayer wrote:
> On Thu, Jul 09, 2015 at 08:16:29PM +0200, Andreas Cadhalpun wrote:
>>  snow.h |    4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 62ba6bae883891f9953478d52d591e5f16aa759e  0001-snow-remove-an-obsolete-av_assert2.patch
>> From 7747ec5a7e319c05e28c6988caa84ad1f37fd301 Mon Sep 17 00:00:00 2001
>> From: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
>> Date: Thu, 9 Jul 2015 19:50:34 +0200
>> Subject: [PATCH] snow: remove an obsolete av_assert2
>>
>> It asserts that the frame linesize is larger than 37, but it can be
>> smaller and decoding such frames works.
>>
>> Before commit cc884a35 src_stride > 7*MB_SIZE was necessary, because the
>> blocks were interleaved in the tmp buffer and the last block was added
>> with an offset of 6*MB_SIZE.
>> It was changed for src_stride <= 7*MB_SIZE to write the blocks
>> sequentially, hence the larger tmp_step.
>> After that the assert was only necessary to make sure that the buffer
>> remained large enough.
>> Since commit bd2b6b33 s->scratchbuf is used as tmp buffer.
>> As part of commit 86e107a7 the minimal scratchbuf size was increased to
>> 256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE.
>>
>> Also add a comment explaining the tmp_step calculation.
>>
>> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> 
> LGTM

Pushed.

Best regards,
Andreas