[Mplayer-cvslog] CVS: main/libmpeg2 slice.c,1.6,1.7

[Arpi]

Hi,

ARGH! this patch was already reversed once.  do not apply again.

> Update of /cvsroot/mplayer/main/libmpeg2
> In directory mplayer:/var/tmp.root/cvs-serv19193/main/libmpeg2
> 
> Modified Files:
> 	slice.c 
> Log Message:
> compilation fixed
> 
> Index: slice.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpeg2/slice.c,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -r1.6 -r1.7
> --- slice.c	7 Nov 2001 01:59:28 -0000	1.6
> +++ slice.c	9 Nov 2001 08:34:37 -0000	1.7
> @@ -32,10 +32,6 @@
>  extern void (* idct_block_copy) (int16_t * block, uint8_t * dest, int stride);
>  extern void (* idct_block_add) (int16_t * block, uint8_t * dest, int stride);
>  
> -#ifdef MPEG12_POSTPROC
> -extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
> -#endif
> -
>  #include "vlc.h"
>  
>  static int non_linear_quantizer_scale [] = {
> @@ -1518,6 +1514,10 @@
>      }									\
>  } while (0)
>  
> +#ifdef MPEG12_POSTPROC
> +int quant_store_mpeg2[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
> +#endif
> +
>  int slice_process (picture_t * picture, uint8_t code, uint8_t * buffer)
>  {
>  #define bit_buf (picture->bitstream_buf)
> @@ -1753,7 +1753,7 @@
>  	}
>  
>  #ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +	quant_store_mpeg2[code][(offset>>4)+1] = picture->quantizer_scale;
>  #endif
>  	offset += 16;
>  	CHECK_DISPLAY;
> @@ -1785,7 +1785,7 @@
>  			MOTION (motion_fi_zero, MACROBLOCK_MOTION_FORWARD);
>  
>  #ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +	quant_store_mpeg2[code][(offset>>4)+1] = picture->quantizer_scale;
>  #endif
>  
>  		    offset += 16;
> @@ -1801,7 +1801,7 @@
>  			MOTION (motion_fi_reuse, macroblock_modes);
>  
>  #ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +	quant_store_mpeg2[code][(offset>>4)+1] = picture->quantizer_scale;
>  #endif
>  
>  		    offset += 16;
> 
> _______________________________________________
> Mplayer-cvslog mailing list
> Mplayer-cvslog at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog
> 
> 


A'rpi / Astral & ESP-team

--
mailto:arpi at thot.banki.hu
http://esp-team.scene.hu