mirror of https://git.ffmpeg.org/ffmpeg.git
* remaining part of John Ryland's patch
Originally committed as revision 1267 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
ae98a91509
commit
9a7b310d06
|
@ -1322,7 +1322,7 @@ void ff_block_permute(INT16 *block, UINT8 *permutation, const UINT8 *scantable,
|
|||
INT16 temp[64];
|
||||
|
||||
if(last<=0) return;
|
||||
if(permutation[1]==1) return; //FIXME its ok but not clean and might fail for some perms
|
||||
//if(permutation[1]==1) return; //FIXME its ok but not clean and might fail for some perms
|
||||
|
||||
for(i=0; i<=last; i++){
|
||||
const int j= scantable[i];
|
||||
|
|
|
@ -3074,7 +3074,8 @@ static int dct_quantize_c(MpegEncContext *s,
|
|||
*overflow= s->max_qcoeff < max; //overflow might have happend
|
||||
|
||||
/* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */
|
||||
ff_block_permute(block, s->idct_permutation, scantable, last_non_zero);
|
||||
if (s->idct_permutation_type != FF_NO_IDCT_PERM)
|
||||
ff_block_permute(block, s->idct_permutation, scantable, last_non_zero);
|
||||
|
||||
return last_non_zero;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue