virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

kill some warnings

Browse Source 
Originally committed as revision 5063 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-02-25 22:41:31 +00:00
parent 285b570fd2
commit 1bd8624697
5 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -5388,8 +5388,6 @@ static const uint8_t block_idx_xy[4][4] = {
};
static int decode_cabac_mb_cbp_luma( H264Context *h) {
MpegEncContext * const s = &h->s;
int cbp = 0;
int cbp_b = -1;
int i8x8;

3
libavcodec/mpegvideo.c
View File

@ -2230,7 +2230,8 @@ static int estimate_best_b_count(MpegEncContext *s){
input[i].linesize[2]= c->width/2;
if(!i || s->input_picture[i-1])
img_resample(resample, &input[i], &pre_input);
img_resample(resample, (AVPicture*)&input[i],
(AVPicture*)&pre_input);
}
for(j=0; j<s->max_b_frames+1; j++){

2
libavcodec/vorbis.c
View File

@ -1345,7 +1345,7 @@ static int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, uint_fa
AV_DEBUG("Classword: %d \n", temp);
assert(vr->classifications > 1 && vr->classifications<256 && temp<=65536); //needed for inverse[]
assert(vr->classifications > 1 && temp<=65536); //needed for inverse[]
for(i=0;i<c_p_c;++i) {
uint_fast32_t temp2;

41
libavcodec/vp3.c
View File

@ -328,7 +328,6 @@ typedef struct Vp3DecodeContext {
int bounding_values_array[256];
} Vp3DecodeContext;
static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb);
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb);
/************************************************************************
@ -2737,46 +2736,6 @@ static inline int theora_get_32bit(GetBitContext gb)
return ret;
}
static int theora_decode_comments(AVCodecContext *avctx, GetBitContext gb)
{
Vp3DecodeContext *s = avctx->priv_data;
int len;
if (s->theora <= 0x030200)
{
int i, comments;
// vendor string
len = get_bits_long(&gb, 32);
len = le2me_32(len);
while(len--)
skip_bits(&gb, 8);
// user comments
comments = get_bits_long(&gb, 32);
comments = le2me_32(comments);
for (i = 0; i < comments; i++)
{
len = get_bits_long(&gb, 32);
len = be2me_32(len);
while(len--)
skip_bits(&gb, 8);
}
}
else
{
do {
len = get_bits_long(&gb, 32);
len = le2me_32(len);
if (len <= 0)
break;
while (len--)
skip_bits(&gb, 8);
} while (1);
}
return 0;
}
static int theora_decode_tables(AVCodecContext *avctx, GetBitContext gb)
{
Vp3DecodeContext *s = avctx->priv_data;

2
libavformat/asf.c
View File

@ -376,7 +376,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
} else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) {
int ext_len, payload_ext_ct, stream_ct;
uint32_t ext_d;
int64_t pos_ex_st, pos_curr;
int64_t pos_ex_st;
pos_ex_st = url_ftell(pb);
get_le64(pb);