diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2002-10-02 22:56:58 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2002-10-02 22:56:58 +0000 |
commit | 3a3d3a42c29424b2ec5a8b3c2b0a2017fbddb9ad (patch) | |
tree | e2c5fbe4c069800806b5d67945cdeac3a271a861 /libavcodec/mpeg12.c | |
parent | 3994623df2efd2749631c3492184dd8d4ffa9d1b (diff) | |
download | ffmpeg-3a3d3a42c29424b2ec5a8b3c2b0a2017fbddb9ad.tar.gz |
fixing custom quantizer matrix decoding
minor optimizations
Originally committed as revision 993 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
-rw-r--r-- | libavcodec/mpeg12.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 18afa7630f..6ae8d7ce08 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1435,7 +1435,7 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); - j = s->intra_scantable.permutated[i]; + j= s->idct_permutation[ ff_zigzag_direct[i] ]; s->intra_matrix[j] = v; s->chroma_intra_matrix[j] = v; } @@ -1443,7 +1443,7 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); - j = s->intra_scantable.permutated[i]; + j= s->idct_permutation[ ff_zigzag_direct[i] ]; s->inter_matrix[j] = v; s->chroma_inter_matrix[j] = v; } @@ -1451,14 +1451,14 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); - j = s->intra_scantable.permutated[i]; + j= s->idct_permutation[ ff_zigzag_direct[i] ]; s->chroma_intra_matrix[j] = v; } } if (get_bits1(&s->gb)) { for(i=0;i<64;i++) { v = get_bits(&s->gb, 8); - j = s->intra_scantable.permutated[i]; + j= s->idct_permutation[ ff_zigzag_direct[i] ]; s->chroma_inter_matrix[j] = v; } } |