Changeset 980

Show
Ignore:
Timestamp:
12/10/99 15:42:47 (14 years ago)
Author:
piers
Message:

Updated to keep gcc-2.95 happy

Location:
vic/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • vic/trunk/codec/framer-h261hw.cpp

    r970 r980  
    234234        register int nbb = nbb_; 
    235235        register int bb = bb_; 
    236         register u_short *bs = bs_; 
     236        register const u_short *bs = bs_; 
    237237 
    238238        if ((mt_ & MT_CBP) == 0) { 
  • vic/trunk/video/assistor-xil.cpp

    r905 r980  
    175175             * more frames in the CIS */ 
    176176            /* Begin XIL molecule */ 
    177             xil_set_attribute(displayimage_,"HW_DECOMPRESS_CIS",-1); 
     177            xil_set_attribute(displayimage_,"HW_DECOMPRESS_CIS",(void *)-1); 
    178178            xil_decompress(cis_, imageYCC); 
    179179            if ((targetw_ == lastcisw) && (targeth_ == lastcish)) { 
     
    319319                // disable (osprey) hardware decompression for Windowed Display. 
    320320                // the software decoder is fast enough 
    321                 xil_set_attribute(displayimage_,"HW_DECOMPRESS_CIS",-1); 
     321                xil_set_attribute(displayimage_,"HW_DECOMPRESS_CIS",(void *)-1); 
    322322/* 
    323323                int arg; 
     
    350350} 
    351351 
    352 extern jpeg_luma_qt(int,int[]); 
    353 extern jpeg_chroma_qt(int,int[]); 
     352extern void jpeg_luma_qt(int,int[]); 
     353extern void jpeg_chroma_qt(int,int[]); 
    354354 
    355355void XILWindowAssistor::reset(int type,int q, int w, int h) 
     
    544544            ilist->pixels[i] = (Xil_unsigned32) pixels[i]; 
    545545    } 
     546#else  
     547UNUSED(ilist); 
    546548#endif 
    547549