mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Fix ;;
Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a56dcc5793
commit
cea9642014
2
ffplay.c
2
ffplay.c
@ -657,7 +657,7 @@ static void video_image_display(VideoState *is)
|
||||
aspect_ratio = 0;
|
||||
else
|
||||
aspect_ratio = av_q2d(is->video_st->codec->sample_aspect_ratio)
|
||||
* is->video_st->codec->width / is->video_st->codec->height;;
|
||||
* is->video_st->codec->width / is->video_st->codec->height;
|
||||
if (aspect_ratio <= 0.0)
|
||||
aspect_ratio = (float)is->video_st->codec->width /
|
||||
(float)is->video_st->codec->height;
|
||||
|
@ -721,7 +721,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
|
||||
|
||||
// s->last_blocksize = s->blocksize;
|
||||
end:
|
||||
i= (get_bits_count(&s->gb)+7)/8;;
|
||||
i= (get_bits_count(&s->gb)+7)/8;
|
||||
if(i > buf_size){
|
||||
av_log(s->avctx, AV_LOG_ERROR, "overread: %d\n", i - buf_size);
|
||||
s->bitstream_size=0;
|
||||
|
@ -387,7 +387,7 @@ static int g726_decode_frame(AVCodecContext *avctx,
|
||||
mask = (1<<c->code_size) - 1;
|
||||
init_get_bits(&gb, buf, buf_size * 8);
|
||||
if (c->bits_left) {
|
||||
int s = c->code_size - c->bits_left;;
|
||||
int s = c->code_size - c->bits_left;
|
||||
code = (c->bit_buffer << s) | get_bits(&gb, s);
|
||||
*samples++ = g726_decode(&c->c, code & mask);
|
||||
}
|
||||
|
@ -2919,7 +2919,7 @@ static int fill_default_ref_list(H264Context *h){
|
||||
if(sel != PICT_FRAME) continue;
|
||||
|
||||
frame_list[ list ][index ]= *h->long_ref[i];
|
||||
frame_list[ list ][index++].pic_id= i;;
|
||||
frame_list[ list ][index++].pic_id= i;
|
||||
}
|
||||
len[list] = index;
|
||||
}
|
||||
@ -2963,7 +2963,7 @@ static int fill_default_ref_list(H264Context *h){
|
||||
sel = h->long_ref[i]->reference | structure_sel;
|
||||
if(sel != PICT_FRAME) continue;
|
||||
frame_list[0][index ]= *h->long_ref[i];
|
||||
frame_list[0][index++].pic_id= i;;
|
||||
frame_list[0][index++].pic_id= i;
|
||||
}
|
||||
|
||||
if (FIELD_PICTURE)
|
||||
@ -5498,7 +5498,7 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
|
||||
if( !qmul ) {
|
||||
block[j] = get_cabac_bypass_sign( CC, -1);
|
||||
}else{
|
||||
block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;;
|
||||
block[j] = (get_cabac_bypass_sign( CC, -qmul[j]) + 32) >> 6;
|
||||
}
|
||||
|
||||
abslevel1++;
|
||||
|
@ -1097,8 +1097,8 @@ static void draw_line(uint8_t *buf, int sx, int sy, int ex, int ey, int w, int h
|
||||
for(y= 0; y <= ey; y++){
|
||||
x = (y*f)>>16;
|
||||
fr= (y*f)&0xFFFF;
|
||||
buf[y*stride + x ]+= (color*(0x10000-fr))>>16;;
|
||||
buf[y*stride + x+1]+= (color* fr )>>16;;
|
||||
buf[y*stride + x ]+= (color*(0x10000-fr))>>16;
|
||||
buf[y*stride + x+1]+= (color* fr )>>16;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2129,7 +2129,7 @@ void ff_draw_horiz_band(MpegEncContext *s, int y, int h){
|
||||
offset[2]=
|
||||
offset[3]= 0;
|
||||
}else{
|
||||
offset[0]= y * s->linesize;;
|
||||
offset[0]= y * s->linesize;
|
||||
offset[1]=
|
||||
offset[2]= (y >> s->chroma_y_shift) * s->uvlinesize;
|
||||
offset[3]= 0;
|
||||
|
@ -473,7 +473,7 @@ static int init_block_mapping(Vp3DecodeContext *s)
|
||||
current_width = -1;
|
||||
current_height = 0;
|
||||
superblock_row_inc = s->macroblock_width -
|
||||
(s->y_superblock_width * 2 - s->macroblock_width);;
|
||||
(s->y_superblock_width * 2 - s->macroblock_width);
|
||||
hilbert = hilbert_walk_mb;
|
||||
mapping_index = 0;
|
||||
current_macroblock = -1;
|
||||
|
@ -133,7 +133,7 @@ static int vqa_decode_init(AVCodecContext *avctx)
|
||||
{
|
||||
VqaContext *s = avctx->priv_data;
|
||||
unsigned char *vqa_header;
|
||||
int i, j, codebook_index;;
|
||||
int i, j, codebook_index;
|
||||
|
||||
s->avctx = avctx;
|
||||
avctx->pix_fmt = PIX_FMT_PAL8;
|
||||
|
@ -107,7 +107,7 @@ static int film_read_header(AVFormatContext *s,
|
||||
/* normal Saturn .cpk files; 32-byte header */
|
||||
if (get_buffer(pb, scratch, 32) != 32)
|
||||
return AVERROR(EIO);
|
||||
film->audio_samplerate = AV_RB16(&scratch[24]);;
|
||||
film->audio_samplerate = AV_RB16(&scratch[24]);
|
||||
film->audio_channels = scratch[21];
|
||||
film->audio_bits = scratch[22];
|
||||
if (film->audio_bits == 8)
|
||||
|
Loading…
Reference in New Issue
Block a user