Fix compilation with ccc
Originally committed as revision 2298 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
fd0f45e58b
commit
e4e70d2e2d
@ -551,7 +551,7 @@ static int decode_i_frame(FourXContext *f, uint8_t *buf, int length){
|
|||||||
uint16_t *dst= (uint16_t*)f->current_picture.data[0];
|
uint16_t *dst= (uint16_t*)f->current_picture.data[0];
|
||||||
const int stride= f->current_picture.linesize[0]>>1;
|
const int stride= f->current_picture.linesize[0]>>1;
|
||||||
const int bitstream_size= get32(buf);
|
const int bitstream_size= get32(buf);
|
||||||
const int token_count __attribute((unused)) = get32(buf + bitstream_size + 8);
|
const int token_count __attribute__((unused)) = get32(buf + bitstream_size + 8);
|
||||||
int prestream_size= 4*get32(buf + bitstream_size + 4);
|
int prestream_size= 4*get32(buf + bitstream_size + 4);
|
||||||
uint8_t *prestream= buf + bitstream_size + 12;
|
uint8_t *prestream= buf + bitstream_size + 12;
|
||||||
|
|
||||||
|
@ -505,6 +505,7 @@ char *pstrcat(char *buf, int buf_size, const char *s);
|
|||||||
|
|
||||||
void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
|
void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem);
|
||||||
|
|
||||||
|
#ifdef __GNUC__
|
||||||
#define dynarray_add(tab, nb_ptr, elem)\
|
#define dynarray_add(tab, nb_ptr, elem)\
|
||||||
do {\
|
do {\
|
||||||
typeof(tab) _tab = (tab);\
|
typeof(tab) _tab = (tab);\
|
||||||
@ -512,6 +513,12 @@ do {\
|
|||||||
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
|
(void)sizeof(**_tab == _elem); /* check that types are compatible */\
|
||||||
__dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
|
__dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\
|
||||||
} while(0)
|
} while(0)
|
||||||
|
#else
|
||||||
|
#define dynarray_add(tab, nb_ptr, elem)\
|
||||||
|
do {\
|
||||||
|
__dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\
|
||||||
|
} while(0)
|
||||||
|
#endif
|
||||||
|
|
||||||
time_t mktimegm(struct tm *tm);
|
time_t mktimegm(struct tm *tm);
|
||||||
const char *small_strptime(const char *p, const char *fmt,
|
const char *small_strptime(const char *p, const char *fmt,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user