Commit 7906085f authored by Falk Hüffner's avatar Falk Hüffner

warning patrol

Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d957696f
...@@ -855,7 +855,7 @@ if test "$sdl" = "no" ; then ...@@ -855,7 +855,7 @@ if test "$sdl" = "no" ; then
fi fi
if test "$debug" = "yes"; then if test "$debug" = "yes"; then
CFLAGS="$CFLAGS -g" CFLAGS="-g $CFLAGS"
fi fi
if test "$optimize" = "small"; then if test "$optimize" = "small"; then
...@@ -868,7 +868,7 @@ if test "$optimize" = "yes"; then ...@@ -868,7 +868,7 @@ if test "$optimize" = "yes"; then
CFLAGS="$CFLAGS -O5" CFLAGS="$CFLAGS -O5"
LDFLAGS="$LDFLAGS -O5" LDFLAGS="$LDFLAGS -O5"
else else
CFLAGS="$CFLAGS -O3" CFLAGS="-O3 $CFLAGS"
fi fi
fi fi
......
...@@ -1468,7 +1468,7 @@ static int http_parse_request(HTTPContext *c) ...@@ -1468,7 +1468,7 @@ static int http_parse_request(HTTPContext *c)
if (eol) { if (eol) {
if (eol[-1] == '\r') if (eol[-1] == '\r')
eol--; eol--;
http_log("%.*s\n", eol - logline, logline); http_log("%.*s\n", (int) (eol - logline), logline);
c->suppress_log = 1; c->suppress_log = 1;
} }
} }
......
...@@ -354,7 +354,7 @@ static int decode_p_frame(FourXContext *f, uint8_t *buf, int length){ ...@@ -354,7 +354,7 @@ static int decode_p_frame(FourXContext *f, uint8_t *buf, int length){
} }
if(bitstream_size != (get_bits_count(&f->gb)+31)/32*4) if(bitstream_size != (get_bits_count(&f->gb)+31)/32*4)
av_log(f->avctx, AV_LOG_ERROR, " %d %d %d bytes left\n", av_log(f->avctx, AV_LOG_ERROR, " %d %zd %zd bytes left\n",
bitstream_size - (get_bits_count(&f->gb)+31)/32*4, bitstream_size - (get_bits_count(&f->gb)+31)/32*4,
bytestream_size - (f->bytestream - (buf + 20 + bitstream_size + wordstream_size)), bytestream_size - (f->bytestream - (buf + 20 + bitstream_size + wordstream_size)),
wordstream_size - (((uint8_t*)f->wordstream) - (buf + 20 + bitstream_size)) wordstream_size - (((uint8_t*)f->wordstream) - (buf + 20 + bitstream_size))
......
...@@ -1895,6 +1895,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode); ...@@ -1895,6 +1895,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode);
void avcodec_get_context_defaults(AVCodecContext *s); void avcodec_get_context_defaults(AVCodecContext *s);
AVCodecContext *avcodec_alloc_context(void); AVCodecContext *avcodec_alloc_context(void);
void avcodec_get_frame_defaults(AVFrame *pic);
AVFrame *avcodec_alloc_frame(void); AVFrame *avcodec_alloc_frame(void);
int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic); int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
......
...@@ -113,7 +113,7 @@ static int dvvideo_init(AVCodecContext *avctx) ...@@ -113,7 +113,7 @@ static int dvvideo_init(AVCodecContext *avctx)
return -ENOMEM; return -ENOMEM;
} }
for (i=0; i<12*27; i++) for (i=0; i<12*27; i++)
(int)dv_anchor[i] = i; dv_anchor[i] = (void*)(size_t)i;
/* NOTE: as a trick, we use the fact the no codes are unused /* NOTE: as a trick, we use the fact the no codes are unused
to accelerate the parsing of partial codes */ to accelerate the parsing of partial codes */
...@@ -896,7 +896,7 @@ static inline void dv_encode_video_segment(DVVideoContext *s, ...@@ -896,7 +896,7 @@ static inline void dv_encode_video_segment(DVVideoContext *s,
static int dv_decode_mt(AVCodecContext *avctx, void* sl) static int dv_decode_mt(AVCodecContext *avctx, void* sl)
{ {
DVVideoContext *s = avctx->priv_data; DVVideoContext *s = avctx->priv_data;
int slice = (int)sl; int slice = (size_t)sl;
dv_decode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80], dv_decode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80],
&s->sys->video_place[slice*5]); &s->sys->video_place[slice*5]);
return 0; return 0;
...@@ -905,7 +905,7 @@ static int dv_decode_mt(AVCodecContext *avctx, void* sl) ...@@ -905,7 +905,7 @@ static int dv_decode_mt(AVCodecContext *avctx, void* sl)
static int dv_encode_mt(AVCodecContext *avctx, void* sl) static int dv_encode_mt(AVCodecContext *avctx, void* sl)
{ {
DVVideoContext *s = avctx->priv_data; DVVideoContext *s = avctx->priv_data;
int slice = (int)sl; int slice = (size_t)sl;
dv_encode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80], dv_encode_video_segment(s, &s->buf[((slice/27)*6+(slice/3)+slice*5+7)*80],
&s->sys->video_place[slice*5]); &s->sys->video_place[slice*5]);
return 0; return 0;
......
...@@ -753,7 +753,6 @@ static int flac_decode_close(AVCodecContext *avctx) ...@@ -753,7 +753,6 @@ static int flac_decode_close(AVCodecContext *avctx)
} }
static void flac_flush(AVCodecContext *avctx){ static void flac_flush(AVCodecContext *avctx){
int i;
FLACContext *s = avctx->priv_data; FLACContext *s = avctx->priv_data;
s->bitstream_size= s->bitstream_size=
......
...@@ -846,7 +846,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s) ...@@ -846,7 +846,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s)
} }
if ((s->stream_ptr != s->stream_end) && if ((s->stream_ptr != s->stream_end) &&
(s->stream_ptr + 1 != s->stream_end)) { (s->stream_ptr + 1 != s->stream_end)) {
av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %d bytes left over\n", av_log(s->avctx, AV_LOG_ERROR, " Interplay video: decode finished with %zd bytes left over\n",
s->stream_end - s->stream_ptr); s->stream_end - s->stream_ptr);
} }
} }
......
...@@ -774,10 +774,6 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) ...@@ -774,10 +774,6 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
int same=1; int same=1;
const int stride= s->linesize; const int stride= s->linesize;
const int uvstride= s->uvlinesize; const int uvstride= s->uvlinesize;
const int xmin= s->me.xmin;
const int ymin= s->me.ymin;
const int xmax= s->me.xmax;
const int ymax= s->me.ymax;
for(block=0; block<4; block++){ for(block=0; block<4; block++){
int mx4, my4; int mx4, my4;
......
...@@ -242,7 +242,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) ...@@ -242,7 +242,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s)
{ {
unsigned int vbv_buffer_size; unsigned int vbv_buffer_size;
unsigned int fps, v; unsigned int fps, v;
int n, i; int i;
uint64_t time_code; uint64_t time_code;
float best_aspect_error= 1E10; float best_aspect_error= 1E10;
float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio); float aspect_ratio= av_q2d(s->avctx->sample_aspect_ratio);
...@@ -954,7 +954,7 @@ static VLC mb_ptype_vlc; ...@@ -954,7 +954,7 @@ static VLC mb_ptype_vlc;
static VLC mb_btype_vlc; static VLC mb_btype_vlc;
static VLC mb_pat_vlc; static VLC mb_pat_vlc;
static void init_vlcs() static void init_vlcs(void)
{ {
static int done = 0; static int done = 0;
...@@ -2821,7 +2821,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx, ...@@ -2821,7 +2821,7 @@ static int mpeg_decode_frame(AVCodecContext *avctx,
input_size = buf_end - buf_ptr; input_size = buf_end - buf_ptr;
if(avctx->debug & FF_DEBUG_STARTCODE){ if(avctx->debug & FF_DEBUG_STARTCODE){
av_log(avctx, AV_LOG_DEBUG, "%3X at %d left %d\n", start_code, buf_ptr-buf, input_size); av_log(avctx, AV_LOG_DEBUG, "%3X at %zd left %d\n", start_code, buf_ptr-buf, input_size);
} }
/* prepare data for next start code */ /* prepare data for next start code */
......
...@@ -3382,7 +3382,6 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y) ...@@ -3382,7 +3382,6 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
int dct_offset = s->linesize*8; //default for progressive frames int dct_offset = s->linesize*8; //default for progressive frames
uint8_t *ptr_y, *ptr_cb, *ptr_cr; uint8_t *ptr_y, *ptr_cb, *ptr_cr;
int wrap_y, wrap_c; int wrap_y, wrap_c;
int emu=0;
for(i=0; i<6; i++) skip_dct[i]=0; for(i=0; i<6; i++) skip_dct[i]=0;
...@@ -4580,7 +4579,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src) ...@@ -4580,7 +4579,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src)
static void encode_picture(MpegEncContext *s, int picture_number) static void encode_picture(MpegEncContext *s, int picture_number)
{ {
int mb_x, mb_y;
int i, j; int i, j;
int bits; int bits;
...@@ -5141,7 +5139,6 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise? ...@@ -5141,7 +5139,6 @@ static int dct_quantize_refine(MpegEncContext *s, //FIXME breaks denoise?
int prev_run=0; int prev_run=0;
int prev_level=0; int prev_level=0;
int qmul, qadd, start_i, last_non_zero, i, dc; int qmul, qadd, start_i, last_non_zero, i, dc;
const int esc_length= s->ac_esc_length;
uint8_t * length; uint8_t * length;
uint8_t * last_length; uint8_t * last_length;
int lambda; int lambda;
...@@ -5249,7 +5246,6 @@ STOP_TIMER("init rem[]") ...@@ -5249,7 +5246,6 @@ STOP_TIMER("init rem[]")
#endif #endif
for(;;){ for(;;){
int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0); int best_score=s->dsp.try_8x8basis(rem, weight, basis[0], 0);
int nochange_score= best_score;
int best_coeff=0; int best_coeff=0;
int best_change=0; int best_change=0;
int run2, best_unquant_change, analyze_gradient; int run2, best_unquant_change, analyze_gradient;
......
...@@ -50,26 +50,26 @@ static int file_open(URLContext *h, const char *filename, int flags) ...@@ -50,26 +50,26 @@ static int file_open(URLContext *h, const char *filename, int flags)
fd = open(filename, access, 0666); fd = open(filename, access, 0666);
if (fd < 0) if (fd < 0)
return -ENOENT; return -ENOENT;
h->priv_data = (void *)fd; h->priv_data = (void *)(size_t)fd;
return 0; return 0;
} }
static int file_read(URLContext *h, unsigned char *buf, int size) static int file_read(URLContext *h, unsigned char *buf, int size)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
return read(fd, buf, size); return read(fd, buf, size);
} }
static int file_write(URLContext *h, unsigned char *buf, int size) static int file_write(URLContext *h, unsigned char *buf, int size)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
return write(fd, buf, size); return write(fd, buf, size);
} }
/* XXX: use llseek */ /* XXX: use llseek */
static offset_t file_seek(URLContext *h, offset_t pos, int whence) static offset_t file_seek(URLContext *h, offset_t pos, int whence)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
#ifdef CONFIG_WIN32 #ifdef CONFIG_WIN32
return _lseeki64(fd, pos, whence); return _lseeki64(fd, pos, whence);
#else #else
...@@ -79,7 +79,7 @@ static offset_t file_seek(URLContext *h, offset_t pos, int whence) ...@@ -79,7 +79,7 @@ static offset_t file_seek(URLContext *h, offset_t pos, int whence)
static int file_close(URLContext *h) static int file_close(URLContext *h)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
return close(fd); return close(fd);
} }
...@@ -106,19 +106,19 @@ static int pipe_open(URLContext *h, const char *filename, int flags) ...@@ -106,19 +106,19 @@ static int pipe_open(URLContext *h, const char *filename, int flags)
#if defined(CONFIG_WIN32) || defined(CONFIG_OS2) || defined(__CYGWIN__) #if defined(CONFIG_WIN32) || defined(CONFIG_OS2) || defined(__CYGWIN__)
setmode(fd, O_BINARY); setmode(fd, O_BINARY);
#endif #endif
h->priv_data = (void *)fd; h->priv_data = (void *)(size_t)fd;
return 0; return 0;
} }
static int pipe_read(URLContext *h, unsigned char *buf, int size) static int pipe_read(URLContext *h, unsigned char *buf, int size)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
return read(fd, buf, size); return read(fd, buf, size);
} }
static int pipe_write(URLContext *h, unsigned char *buf, int size) static int pipe_write(URLContext *h, unsigned char *buf, int size)
{ {
int fd = (int)h->priv_data; int fd = (size_t)h->priv_data;
return write(fd, buf, size); return write(fd, buf, size);
} }
......
...@@ -24,6 +24,6 @@ extern FrameHookRelease Release; ...@@ -24,6 +24,6 @@ extern FrameHookRelease Release;
extern int frame_hook_add(int argc, char *argv[]); extern int frame_hook_add(int argc, char *argv[]);
extern void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height); extern void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height);
extern void frame_hook_release(); extern void frame_hook_release(void);
#endif #endif
...@@ -927,7 +927,7 @@ ebml_read_header (MatroskaDemuxContext *matroska, ...@@ -927,7 +927,7 @@ ebml_read_header (MatroskaDemuxContext *matroska,
return res; return res;
if (num > sizeof(uint32_t)) { if (num > sizeof(uint32_t)) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"IDs of size %llu (> %d) not supported\n", "IDs of size %llu (> %zu) not supported\n",
num, sizeof(uint32_t)); num, sizeof(uint32_t));
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
......
...@@ -917,7 +917,7 @@ static int mov_write_header(AVFormatContext *s) ...@@ -917,7 +917,7 @@ static int mov_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int Timestamp() { static int Timestamp(void) {
return 1067949799U+(24107*86400); //its the modification time of this line :) return 1067949799U+(24107*86400); //its the modification time of this line :)
} }
......
...@@ -82,10 +82,10 @@ typedef struct { ...@@ -82,10 +82,10 @@ typedef struct {
static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 }; static const int lpcm_freq_tab[4] = { 48000, 96000, 44100, 32000 };
#ifdef CONFIG_ENCODERS #ifdef CONFIG_ENCODERS
extern AVOutputFormat mpeg1system_mux; static AVOutputFormat mpeg1system_mux;
extern AVOutputFormat mpeg1vcd_mux; static AVOutputFormat mpeg1vcd_mux;
extern AVOutputFormat mpeg2vob_mux; static AVOutputFormat mpeg2vob_mux;
extern AVOutputFormat mpeg2svcd_mux; static AVOutputFormat mpeg2svcd_mux;
static int put_pack_header(AVFormatContext *ctx, static int put_pack_header(AVFormatContext *ctx,
uint8_t *buf, int64_t timestamp) uint8_t *buf, int64_t timestamp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment