RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix unused variable warnings 

Originally committed as revision 4609 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2005-09-21 23:09:16 +00:00
parent 12e9668119
commit 62ab0b7822
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/oggvorbis.c
View File

@ -294,7 +294,7 @@ static int oggvorbis_decode_frame(AVCodecContext *avccontext,
OggVorbisContext *context = avccontext->priv_data ;
float **pcm ;
ogg_packet *op= &context->op;
int samples, total_samples, total_bytes,i;
int samples, total_samples, total_bytes;
if(!buf_size){
//FIXME flush

23
libavcodec/snow.c
View File

@ -500,7 +500,6 @@ static void slice_buffer_init(slice_buffer * buf, int line_count, int max_alloca
static DWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
{
int i;
int offset;
DWTELEM * buffer;
@ -523,7 +522,6 @@ static DWTELEM * slice_buffer_load_line(slice_buffer * buf, int line)
static void slice_buffer_release(slice_buffer * buf, int line)
{
int i;
int offset;
DWTELEM * buffer;
@ -933,7 +931,7 @@ static void horizontal_decomposeX(DWTELEM *b, int width){
DWTELEM temp[width];
const int width2= width>>1;
const int w2= (width+1)>>1;
int A1,A2,A3,A4, x;
int x;
inplace_lift(b, width, COEFFS1, N1, SHIFT1, LX1, 0);
inplace_lift(b, width, COEFFS2, N2, SHIFT2, LX0, 0);
@ -952,7 +950,7 @@ static void horizontal_decomposeX(DWTELEM *b, int width){
static void horizontal_composeX(DWTELEM *b, int width){
DWTELEM temp[width];
const int width2= width>>1;
int A1,A2,A3,A4, x;
int x;
const int w2= (width+1)>>1;
memcpy(temp, b, width*sizeof(int));
@ -1010,7 +1008,7 @@ static void spatial_composeX(DWTELEM *buffer, int width, int height, int stride)
static void horizontal_decompose53i(DWTELEM *b, int width){
DWTELEM temp[width];
const int width2= width>>1;
int A1,A2,A3,A4, x;
int x;
const int w2= (width+1)>>1;
for(x=0; x<width2; x++){
@ -1020,6 +1018,8 @@ static void horizontal_decompose53i(DWTELEM *b, int width){
if(width&1)
temp[x ]= b[2*x ];
#if 0
{
int A1,A2,A3,A4;
A2= temp[1 ];
A4= temp[0 ];
A1= temp[0+width2];
@ -1047,6 +1047,7 @@ static void horizontal_decompose53i(DWTELEM *b, int width){
A2 += (A1 + A3 + 2)>>2;
b[width -1] = A3;
b[width2-1] = A2;
}
#else
lift(b+w2, temp+w2, temp, 1, 1, 1, width, -1, 0, 1, 1, 0);
lift(b , temp , b+w2, 1, 1, 1, width, 1, 2, 2, 0, 0);
@ -1268,9 +1269,10 @@ static void horizontal_compose53i(DWTELEM *b, int width){
DWTELEM temp[width];
const int width2= width>>1;
const int w2= (width+1)>>1;
int A1,A2,A3,A4, x;
int x;
#if 0
int A1,A2,A3,A4;
A2= temp[1 ];
A4= temp[0 ];
A1= temp[0+width2];
@ -1452,7 +1454,9 @@ static void vertical_compose97i(DWTELEM *b0, DWTELEM *b1, DWTELEM *b2, DWTELEM *
int i;
for(i=0; i<width; i++){
#ifndef lift5
int r;
#endif
b4[i] -= (W_DM*(b3[i] + b5[i])+W_DO)>>W_DS;
#ifdef lift5
b3[i] -= (W_CM*(b2[i] + b4[i])+W_CO)>>W_CS;
@ -1877,7 +1881,7 @@ static inline void unpack_coeffs(SnowContext *s, SubBand *b, SubBand * parent, i
static inline void decode_subband_slice_buffered(SnowContext *s, SubBand *b, slice_buffer * sb, int start_y, int h, int save_state[1]){
const int w= b->width;
int x,y;
int y;
const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
@ -2583,7 +2587,6 @@ assert(src_stride > 2*MB_SIZE + 5);
START_TIMER
int block_index = 0;
for(y=0; y<b_h; y++){
//FIXME ugly missue of obmc_stride
uint8_t *obmc1= obmc + y*obmc_stride;
@ -2908,7 +2911,7 @@ static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int b
const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
int x,y, thres1, thres2;
START_TIMER
// START_TIMER
if(s->qlog == LOSSLESS_QLOG) return;
@ -2964,7 +2967,6 @@ static void quantize(SnowContext *s, SubBand *b, DWTELEM *src, int stride, int b
static void dequantize_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int start_y, int end_y){
const int w= b->width;
const int h= b->height;
const int qlog= clip(s->qlog + b->qlog, 0, QROOT*16);
const int qmul= qexp[qlog&(QROOT-1)]<<(qlog>>QSHIFT);
const int qadd= (s->qbias*qmul)>>QBIAS_SHIFT;
@ -3042,7 +3044,6 @@ static void decorrelate(SnowContext *s, SubBand *b, DWTELEM *src, int stride, in
static void correlate_slice_buffered(SnowContext *s, slice_buffer * sb, SubBand *b, DWTELEM *src, int stride, int inverse, int use_median, int start_y, int end_y){
const int w= b->width;
const int h= b->height;
int x,y;
// START_TIMER

2
libavcodec/vc9.c
View File

@ -1983,7 +1983,7 @@ int vc9_decode_i_mb(VC9Context *v, DCTELEM block[6][64])
{
int i, cbp, val;
uint8_t *coded_val;
uint32_t * const mb_type_ptr= &v->s.current_picture.mb_type[ v->s.mb_x + v->s.mb_y*v->s.mb_stride ];
// uint32_t * const mb_type_ptr= &v->s.current_picture.mb_type[ v->s.mb_x + v->s.mb_y*v->s.mb_stride ];
v->s.mb_intra = 1;
cbp = get_vlc2(&v->s.gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);

4
libavformat/ogg.c
View File

@ -34,7 +34,7 @@ static int ogg_write_header(AVFormatContext *avfcontext)
{
OggContext *context = avfcontext->priv_data;
ogg_packet *op= &context->op;
int n, i;
int n;
ogg_stream_init(&context->os, 31415);
@ -44,7 +44,7 @@ static int ogg_write_header(AVFormatContext *avfcontext)
int headers_len = codec->extradata_size;
uint8_t *header_start[3];
int header_len[3];
int i, j, hdr_type;
int i, j;
av_set_pts_info(avfcontext->streams[n], 60, 1, AV_TIME_BASE);