virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

changed quant matrix order (should fix mmx mpeg decoding bug)

Browse Source 
Originally committed as revision 49 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2001-08-07 22:47:08 +00:00
parent 47476fa9fd
commit 6083244881
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/mpeg12.c
View File

@ -1172,32 +1172,36 @@ static void mpeg_decode_sequence_extension(MpegEncContext *s)
static void mpeg_decode_quant_matrix_extension(MpegEncContext *s) static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
{ {
int i, v; int i, v, j;
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_intra_matrix[i] = v; s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
} }
} }
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->non_intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_non_intra_matrix[i] = v; s->non_intra_matrix[j] = v;
s->chroma_non_intra_matrix[j] = v;
} }
} }
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->chroma_intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_intra_matrix[j] = v;
} }
} }
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->chroma_non_intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_non_intra_matrix[j] = v;
} }
} }
} }
@ -1345,7 +1349,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
{ {
Mpeg1Context *s1 = avctx->priv_data; Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
int width, height, i, v; int width, height, i, v, j;
init_get_bits(&s->gb, buf, buf_size); init_get_bits(&s->gb, buf, buf_size);
@ -1389,8 +1393,9 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_intra_matrix[i] = v; s->intra_matrix[j] = v;
s->chroma_intra_matrix[j] = v;
} }
} else { } else {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
@ -1402,8 +1407,9 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx,
if (get_bits1(&s->gb)) { if (get_bits1(&s->gb)) {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
v = get_bits(&s->gb, 8); v = get_bits(&s->gb, 8);
s->non_intra_matrix[i] = v; j = block_permute_op(i);
s->chroma_non_intra_matrix[i] = v; s->non_intra_matrix[j] = v;
s->chroma_non_intra_matrix[j] = v;
} }
} else { } else {
for(i=0;i<64;i++) { for(i=0;i<64;i++) {