Commit 2d661e07 authored by Michael Niedermayer's avatar Michael Niedermayer

cosmetics (initalize variables where they are used)

Originally committed as revision 5356 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 11b68168
...@@ -7782,11 +7782,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7782,11 +7782,7 @@ static int decode_frame(AVCodecContext *avctx,
/* Sort B-frames into display order */ /* Sort B-frames into display order */
Picture *cur = s->current_picture_ptr; Picture *cur = s->current_picture_ptr;
Picture *prev = h->delayed_output_pic; Picture *prev = h->delayed_output_pic;
int out_idx = 0; int i, pics, cross_idr, out_of_order, out_idx;
int pics = 0;
int out_of_order;
int cross_idr = 0;
int i;
if(h->sps.bitstream_restriction_flag if(h->sps.bitstream_restriction_flag
&& s->avctx->has_b_frames < h->sps.num_reorder_frames){ && s->avctx->has_b_frames < h->sps.num_reorder_frames){
...@@ -7794,16 +7790,19 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -7794,16 +7790,19 @@ static int decode_frame(AVCodecContext *avctx,
s->low_delay = 0; s->low_delay = 0;
} }
pics = 0;
while(h->delayed_pic[pics]) pics++; while(h->delayed_pic[pics]) pics++;
h->delayed_pic[pics++] = cur; h->delayed_pic[pics++] = cur;
if(cur->reference == 0) if(cur->reference == 0)
cur->reference = 1; cur->reference = 1;
cross_idr = 0;
for(i=0; h->delayed_pic[i]; i++) for(i=0; h->delayed_pic[i]; i++)
if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0) if(h->delayed_pic[i]->key_frame || h->delayed_pic[i]->poc==0)
cross_idr = 1; cross_idr = 1;
out = h->delayed_pic[0]; out = h->delayed_pic[0];
out_idx = 0;
for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++) for(i=1; h->delayed_pic[i] && !h->delayed_pic[i]->key_frame; i++)
if(h->delayed_pic[i]->poc < out->poc){ if(h->delayed_pic[i]->poc < out->poc){
out = h->delayed_pic[i]; out = h->delayed_pic[i];
......
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