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

[pl]

On Wed, Nov 14, 2001 at 08:05:35PM +0100, Jürgen Keil wrote:
> Update of /cvsroot/mplayer/main/libmpeg2
> In directory mplayer:/var/tmp.root/cvs-serv20808
> 
> Modified Files:
> 	mpeg2_internal.h slice.c 
> Log Message:
> quant_store_mpeg2 referenced, but nowhere defined?
> 
> Disable the code that references quant_store_mpeg2, it leads to undefined
> external symbol references on solaris.

It was fixed a while ago.

Your cvs seems partially not up-to-date: remove the files and redo an
update.

'cvs update' fscks up things when patches are reversed :/

Arpi: it should really be a new commit when you want to reverse patches:
that way, a real history of changes is kept and the same patch is not
reapplied again and again... (plus it fixes the mess with versions
numbers)


> Index: mpeg2_internal.h
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libmpeg2/mpeg2_internal.h,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -r1.11 -r1.12
> --- mpeg2_internal.h	7 Nov 2001 01:59:28 -0000	1.11
> +++ mpeg2_internal.h	14 Nov 2001 19:05:32 -0000	1.12
> @@ -220,4 +220,7 @@
>  #ifdef MPEG12_POSTPROC
>  #define MPEG2_MBC 120
>  #define MPEG2_MBR 72
> +#ifdef __undef__ /* MPEG12_POSTPROC */
> +extern int quant_store_mpeg2[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
> +#endif
>  #endif
> 
> 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	14 Nov 2001 19:05:32 -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 [] = {
> @@ -1752,8 +1748,8 @@
>  		picture->dc_dct_pred[2] = 1 << (picture->intra_dc_precision+7);
>  	}
>  
> -#ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +#ifdef __undef__ /* MPEG12_POSTPROC */
> +	quant_store_mpeg2[code][(offset>>4)+1] = picture->quantizer_scale;
>  #endif
>  	offset += 16;
>  	CHECK_DISPLAY;
> @@ -1784,8 +1780,8 @@
>  		    else
>  			MOTION (motion_fi_zero, MACROBLOCK_MOTION_FORWARD);
>  
> -#ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +#ifdef __undef__ /* MPEG12_POSTPROC */
> +	quant_store_mpeg2[code][(offset>>4)+1] = picture->quantizer_scale;
>  #endif
>  
>  		    offset += 16;
> @@ -1800,8 +1796,8 @@
>  		    else
>  			MOTION (motion_fi_reuse, macroblock_modes);
>  
> -#ifdef MPEG12_POSTPROC
> -	quant_store[code][(offset>>4)+1] = picture->quantizer_scale;
> +#ifdef __undef__ /* MPEG12_POSTPROC */
> +	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
>