diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2015-10-12 19:37:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-10-13 00:01:39 +0200 |
| commit | 9f3bfe30dd99b093a469e566dbd95448b32f80e9 (patch) | |
| tree | 71aba6a09f800c415c0917a4f32cc1186cc67460 /libavcodec/mpegvideo_enc.c | |
| parent | 97437bd17a8c5d4135b2f3b1b299bd7bb72ce02c (diff) | |
| download | ffmpeg-streaming-9f3bfe30dd99b093a469e566dbd95448b32f80e9.zip ffmpeg-streaming-9f3bfe30dd99b093a469e566dbd95448b32f80e9.tar.gz | |
mpegvideo: dnxhdenc: permute 10bits content
Dequant or encoding were trying to reverse a scan that hadn't been
applied...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index a6af8bd..1e8d240 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -4555,8 +4555,8 @@ STOP_TIMER("iterative search") * permutation up, the block is not (inverse) permutated * to scantable order! */ -static void block_permute(int16_t *block, uint8_t *permutation, - const uint8_t *scantable, int last) +void ff_block_permute(int16_t *block, uint8_t *permutation, + const uint8_t *scantable, int last) { int i; int16_t temp[64]; @@ -4655,7 +4655,7 @@ int ff_dct_quantize_c(MpegEncContext *s, /* we need this permutation so that we correct the IDCT, we only permute the !=0 elements */ if (s->idsp.perm_type != FF_IDCT_PERM_NONE) - block_permute(block, s->idsp.idct_permutation, + ff_block_permute(block, s->idsp.idct_permutation, scantable, last_non_zero); return last_non_zero; |
