Mercurial > mplayer.hg

comparison libmpeg2/libmpeg-0.4.0.diff @ 20640:c52bb8d6edea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update for r20654
author henry
date Sat, 04 Nov 2006 07:14:50 +0000
parents 7a9116ae7fc0
children 6053051bdc75
comparison
equal deleted inserted replaced
20639:2a2f3db46103 20640:c52bb8d6edea
375 DUMPBITS (bit_buf, bits, 5); 375 DUMPBITS (bit_buf, bits, 5);
376 + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code]; 376 + decoder->quantizer_scale = decoder->quantizer_scales[quantizer_scale_code];
377 377
378 decoder->quantizer_matrix[0] = 378 decoder->quantizer_matrix[0] =
379 decoder->quantizer_prescale[0][quantizer_scale_code]; 379 decoder->quantizer_prescale[0][quantizer_scale_code];
380 @@ -1564,6 +1569,9 @@ 380 @@ -1568,6 +1569,18 @@
381 381
382 #define NEXT_MACROBLOCK \ 382 #define NEXT_MACROBLOCK \
383 do { \ 383 do { \
384 + if(decoder->quant_store) \ 384 + if(decoder->quant_store) { \
385 + if (decoder->picture_structure == TOP_FIELD) \
386 + decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \
387 + +(decoder->offset>>4)] = decoder->quantizer_scale; \
388 + else if (decoder->picture_structure == BOTTOM_FIELD) \
389 + decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \
390 + + decoder->quant_stride \
391 + +(decoder->offset>>4)] = decoder->quantizer_scale; \
392 + else \
385 + decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \ 393 + decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \
386 + +(decoder->offset>>4)] = decoder->quantizer_scale; \ 394 + +(decoder->offset>>4)] = decoder->quantizer_scale; \
395 + } \
387 decoder->offset += 16; \ 396 decoder->offset += 16; \
388 if (decoder->offset == decoder->width) { \ 397 if (decoder->offset == decoder->width) { \
389 do { /* just so we can use the break statement */ \ 398 do { /* just so we can use the break statement */ \