CVS: main/libmpeg2 decode.c,1.18,1.19 mpeg2_internal.h,1.10,1.11 slice.c,1.5,1.6
Update of /cvsroot/mplayer/main/libmpeg2 In directory mplayer:/var/tmp.root/cvs-serv31101/libmpeg2 Modified Files: decode.c mpeg2_internal.h slice.c Log Message: ffmpeg and libpmeg2 defined a different quant_store (break compilation) libmpeg2's quant_store renamed to quant_store_mpeg2 Index: decode.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/decode.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- decode.c 5 Nov 2001 18:12:27 -0000 1.18 +++ decode.c 6 Nov 2001 16:47:15 -0000 1.19 @@ -57,7 +57,7 @@ #ifdef MPEG12_POSTPROC #include "../postproc/postprocess.h" -int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] +int quant_store_mpeg2[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], (MPEG2_MBC+1), picture->pp_options); + &quant_store_mpeg2[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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mpeg2_internal.h 5 Nov 2001 18:12:27 -0000 1.10 +++ mpeg2_internal.h 6 Nov 2001 16:47:15 -0000 1.11 @@ -220,5 +220,5 @@ #ifdef MPEG12_POSTPROC #define MPEG2_MBC 120 #define MPEG2_MBR 72 -extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] +extern int quant_store_mpeg2[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] #endif Index: slice.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/slice.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- slice.c 18 Mar 2001 19:41:31 -0000 1.5 +++ slice.c 6 Nov 2001 16:47:15 -0000 1.6 @@ -1749,7 +1749,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; @@ -1781,7 +1781,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; @@ -1797,7 +1797,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;
Hi, wtf. it breaks compilation only when users use different version (date) of libavcodec and mplayer. i've chanegd both libs at the same time... i'l reverse this patch.
Update of /cvsroot/mplayer/main/libmpeg2 In directory mplayer:/var/tmp.root/cvs-serv31101/libmpeg2
Modified Files: decode.c mpeg2_internal.h slice.c Log Message: ffmpeg and libpmeg2 defined a different quant_store (break compilation) libmpeg2's quant_store renamed to quant_store_mpeg2
Index: decode.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/decode.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- decode.c 5 Nov 2001 18:12:27 -0000 1.18 +++ decode.c 6 Nov 2001 16:47:15 -0000 1.19 @@ -57,7 +57,7 @@
#ifdef MPEG12_POSTPROC #include "../postproc/postprocess.h" -int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] +int quant_store_mpeg2[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], (MPEG2_MBC+1), picture->pp_options); + &quant_store_mpeg2[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.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- mpeg2_internal.h 5 Nov 2001 18:12:27 -0000 1.10 +++ mpeg2_internal.h 6 Nov 2001 16:47:15 -0000 1.11 @@ -220,5 +220,5 @@ #ifdef MPEG12_POSTPROC #define MPEG2_MBC 120 #define MPEG2_MBR 72 -extern int quant_store[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] +extern int quant_store_mpeg2[MPEG2_MBR+1][MPEG2_MBC+1]; // [Review] #endif
Index: slice.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/slice.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- slice.c 18 Mar 2001 19:41:31 -0000 1.5 +++ slice.c 6 Nov 2001 16:47:15 -0000 1.6 @@ -1749,7 +1749,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; @@ -1781,7 +1781,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; @@ -1797,7 +1797,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@mplayerhq.hu http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog
A'rpi / Astral & ESP-team -- mailto:arpi@thot.banki.hu http://esp-team.scene.hu
It's the Question that drives us, Arpi :
i'l reverse this patch. Rather come to IRC at last, won't you? ;))
-- Gabucino
On Tue, Nov 06, 2001 at 11:31:37PM +0200, Arpi wrote:
Hi,
wtf. it breaks compilation only when users use different version (date) of libavcodec and mplayer. i've chanegd both libs at the same time... i'l reverse this patch. Ok.
It has been broken on my systems since yesterday. (Though I use libavcodec dir copied from a ffmpeg cvs. weird :/) -- Regards, pl
Hi,
On Tue, Nov 06, 2001 at 11:31:37PM +0200, Arpi wrote:
Hi,
wtf. it breaks compilation only when users use different version (date) of libavcodec and mplayer. i've chanegd both libs at the same time... i'l reverse this patch. Ok.
It has been broken on my systems since yesterday. (Though I use libavcodec dir copied from a ffmpeg cvs. weird :/)
really. see: diff -u -d -r1.8 -r1.9 --- avcodec.h 2001/10/16 23:10:38 1.8 +++ avcodec.h 2001/11/05 18:23:31 1.9 @@ -239,8 +239,8 @@ #ifdef FF_POSTPROCESS #ifndef MBC -#define MBC 48 -#define MBR 36 +#define MBC 120 +#define MBR 72 #endif extern int quant_store[MBR+1][MBC+1]; // [Review] #endif it was from ffmpeg-devel cvslog. so, using the updated avcodec.h you shouldn't have compile errors. A'rpi / Astral & ESP-team -- mailto:arpi@thot.banki.hu http://esp-team.scene.hu
participants (4)
-
Arpi -
Gabucino -
pl -
pl