[MPlayer-cvslog] r20656 - trunk/libmpeg2/libmpeg-0.4.0.diff

[henry]

Author: henry
Date: Sat Nov  4 08:14:50 2006
New Revision: 20656

Modified:
   trunk/libmpeg2/libmpeg-0.4.0.diff

Log:
update for r20654

Modified: trunk/libmpeg2/libmpeg-0.4.0.diff
==============================================================================
--- trunk/libmpeg2/libmpeg-0.4.0.diff	(original)
+++ trunk/libmpeg2/libmpeg-0.4.0.diff	Sat Nov  4 08:14:50 2006
@@ -377,13 +377,22 @@
  
      decoder->quantizer_matrix[0] =
  	decoder->quantizer_prescale[0][quantizer_scale_code];
-@@ -1564,6 +1569,9 @@
+@@ -1568,6 +1569,18 @@
  
  #define NEXT_MACROBLOCK							\
  do {									\
-+    if(decoder->quant_store)                                            \
++    if(decoder->quant_store) {                                          \
++       if (decoder->picture_structure == TOP_FIELD)                     \
++        decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \
++                    +(decoder->offset>>4)] = decoder->quantizer_scale;  \
++       else if (decoder->picture_structure == BOTTOM_FIELD)             \
++        decoder->quant_store[2*decoder->quant_stride*(decoder->v_offset>>4) \
++	            + decoder->quant_stride                             \
++                    +(decoder->offset>>4)] = decoder->quantizer_scale;  \
++       else                                                             \
 +        decoder->quant_store[decoder->quant_stride*(decoder->v_offset>>4) \
 +                    +(decoder->offset>>4)] = decoder->quantizer_scale;  \
++    }                                                                   \
      decoder->offset += 16;						\
      if (decoder->offset == decoder->width) {				\
  	do { /* just so we can use the break statement */		\