mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Warning fixes.
Originally committed as revision 1884 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
94d44f455c
commit
3db320ea0c
2
ffmpeg.c
2
ffmpeg.c
@ -680,7 +680,7 @@ static void do_video_stats(AVFormatContext *os, AVOutputStream *ost,
|
||||
avg_bitrate = (double)(total_size * 8) / ti1 / 1000.0;
|
||||
fprintf(fvstats, "s_size= %8.0fkB time= %0.3f br= %7.1fkbits/s avg_br= %7.1fkbits/s ",
|
||||
(double)total_size / 1024, ti1, bitrate, avg_bitrate);
|
||||
fprintf(fvstats,"type= %s\n", av_get_pict_type_char(enc->coded_frame->pict_type));
|
||||
fprintf(fvstats,"type= %c\n", av_get_pict_type_char(enc->coded_frame->pict_type));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2563,7 +2563,7 @@ static Picture * remove_short(H264Context *h, int frame_num){
|
||||
for(i=0; i<h->short_ref_count; i++){
|
||||
Picture *pic= h->short_ref[i];
|
||||
if(s->avctx->debug&FF_DEBUG_MMCO)
|
||||
printf("%d %d %X\n", i, pic->frame_num, (int)pic);
|
||||
printf("%d %d %p\n", i, pic->frame_num, pic);
|
||||
if(pic->frame_num == frame_num){
|
||||
h->short_ref[i]= NULL;
|
||||
memmove(&h->short_ref[i], &h->short_ref[i+1], (h->short_ref_count - i - 1)*sizeof(Picture*));
|
||||
|
@ -478,7 +478,7 @@ static void escape_FF(MpegEncContext *s, int start)
|
||||
int size= get_bit_count(&s->pb) - start*8;
|
||||
int i, ff_count;
|
||||
uint8_t *buf= s->pb.buf + start;
|
||||
int align= (-(int)(buf))&3;
|
||||
int align= (-(size_t)(buf))&3;
|
||||
|
||||
assert((size&7) == 0);
|
||||
size >>= 3;
|
||||
|
@ -43,8 +43,8 @@
|
||||
op_pixels_func (*chroma_hpel_put)[4];\
|
||||
qpel_mc_func (*qpel_put)[16];\
|
||||
qpel_mc_func (*qpel_avg)[16]= &s->dsp.avg_qpel_pixels_tab[size];\
|
||||
const __attribute__((unused)) int unu= time_pp + time_pb + (int)src_u + (int)src_v + (int)ref_u + (int)ref_v\
|
||||
+ (int)ref2_y + (int)hpel_avg + (int)qpel_avg + (int)score_map;\
|
||||
const __attribute__((unused)) int unu= time_pp + time_pb + (size_t)src_u + (size_t)src_v + (size_t)ref_u + (size_t)ref_v\
|
||||
+ (size_t)ref2_y + (size_t)hpel_avg + (size_t)qpel_avg + (size_t)score_map;\
|
||||
if(s->no_rounding /*FIXME b_type*/){\
|
||||
hpel_put= &s->dsp.put_no_rnd_pixels_tab[size];\
|
||||
chroma_hpel_put= &s->dsp.put_no_rnd_pixels_tab[size+1];\
|
||||
|
@ -141,7 +141,7 @@ static int raw_close_decoder(AVCodecContext *avctx)
|
||||
|
||||
static int raw_init_encoder(AVCodecContext *avctx)
|
||||
{
|
||||
avctx->coded_frame = (AVPicture*)avctx->priv_data;
|
||||
avctx->coded_frame = (AVFrame *)avctx->priv_data;
|
||||
avctx->coded_frame->pict_type = FF_I_TYPE;
|
||||
avctx->coded_frame->key_frame = 1;
|
||||
avctx->codec_tag = findFourCC(avctx->pix_fmt);
|
||||
|
Loading…
Reference in New Issue
Block a user