[Mplayer-cvslog] CVS: main/libmpeg2 decode.c,1.17,1.18 mpeg2_internal.h,Tue Nov 6 23:05:12 2001

[Arpi]

Hi,

> Hi
> 
> This seems to break compilation when libavcodec/ from ffmpeg cvs is used.
> gcc spits:
>  In file included from dec_video.c:59:
>  libavcodec/avcodec.h:245: conflicting types for `quant_store'
>  libmpeg2/mpeg2_internal.h:223: previous declaration of `quant_store'
> 
> In libavcodec/avcodec.h:
> #ifdef FF_POSTPROCESS
> #ifndef MBC
> #define MBC 48
> #define MBR 36
> #endif
> extern int quant_store[MBR+1][MBC+1]; // [Review]
> #endif
> 
> A name change will probably fix it.

i've updated ffmpeg cvs too. so use the same date of ffmpeg and mplayer

> 
> On Mon, Nov 05, 2001 at 07:12:30PM +0100, Arpi of Ize wrote:
> > Update of /cvsroot/mplayer/main/libmpeg2
> > In directory mplayer:/var/tmp.root/cvs-serv17185
> > 
> > Modified Files:
> > 	decode.c mpeg2_internal.h 
> > Log Message:
> > MBC->MPEG2_MBC, max image size increased
> > 
> > Index: decode.c
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/libmpeg2/decode.c,v
> > retrieving revision 1.17
> > retrieving revision 1.18
> > diff -u -r1.17 -r1.18
> > --- decode.c	18 Oct 2001 15:43:35 -0000	1.17
> > +++ decode.c	5 Nov 2001 18:12:27 -0000	1.18
> > @@ -57,7 +57,7 @@
> >  
> >  #ifdef MPEG12_POSTPROC
> >  #include "../postproc/postprocess.h"
> > -int quant_store[MBR+1][MBC+1]; // [Review]
> > +int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
> >  #endif
> >  
> >  static table_init_state=0;
> > @@ -182,7 +182,7 @@
> >  			picture->forward_reference_frame->base,
> >  			stride[0], frames[3].base, stride[0],
> >                          picture->coded_picture_width, picture->coded_picture_height,
> > -                        &quant_store[1][1], (MBC+1), picture->pp_options);
> > +                        &quant_store[1][1], (MPEG2_MBC+1), picture->pp_options);
> >  	output->draw_slice (frames[3].base, stride, 
> >                          picture->display_picture_width,
> >                          picture->display_picture_height, 0, 0);
> > 
> > Index: mpeg2_internal.h
> > ===================================================================
> > RCS file: /cvsroot/mplayer/main/libmpeg2/mpeg2_internal.h,v
> > retrieving revision 1.9
> > retrieving revision 1.10
> > diff -u -r1.9 -r1.10
> > --- mpeg2_internal.h	14 Oct 2001 17:29:49 -0000	1.9
> > +++ mpeg2_internal.h	5 Nov 2001 18:12:27 -0000	1.10
> > @@ -218,7 +218,7 @@
> >  
> >  
> >  #ifdef MPEG12_POSTPROC
> > -#define MBC 48
> > -#define MBR 36
> > -extern int quant_store[MBR+1][MBC+1]; // [Review]
> > +#define MPEG2_MBC 120
> > +#define MPEG2_MBR 72
> > +extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review]
> >  #endif
> 
> --
> Regards,
>   pl
>  
> _______________________________________________
> 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