RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-18 21:07:01 +00:00
Code Issues Projects Releases Wiki Activity

Move initialization of {luma,chroma}_weight_flag[] up,

Browse Source 
to make sure they are always initialized.
Patch by Gwenole Beauchesne g${name} splitted-desktop com

Originally committed as revision 17393 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Gwenole Beauchesne 2009-02-17 13:41:27 +00:00 committed by Benoit Fouet
parent de86157836
commit ce09f9270a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@ -3046,6 +3046,11 @@ static void implicit_weight_table(H264Context *h){
int ref0, ref1, i; int ref0, ref1, i;
int cur_poc = s->current_picture_ptr->poc; int cur_poc = s->current_picture_ptr->poc;
for (i = 0; i < 2; i++) {
h->luma_weight_flag[i] = 0;
h->chroma_weight_flag[i] = 0;
}
if( h->ref_count[0] == 1 && h->ref_count[1] == 1 if( h->ref_count[0] == 1 && h->ref_count[1] == 1
&& h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){ && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){
h->use_weight= 0; h->use_weight= 0;
@ -3057,10 +3062,6 @@ static void implicit_weight_table(H264Context *h){
h->use_weight_chroma= 2; h->use_weight_chroma= 2;
h->luma_log2_weight_denom= 5; h->luma_log2_weight_denom= 5;
h->chroma_log2_weight_denom= 5; h->chroma_log2_weight_denom= 5;
for (i = 0; i < 2; i++) {
h->luma_weight_flag[i] = 0;
h->chroma_weight_flag[i] = 0;
}
for(ref0=0; ref0 < h->ref_count[0]; ref0++){ for(ref0=0; ref0 < h->ref_count[0]; ref0++){
int poc0 = h->ref_list[0][ref0].poc; int poc0 = h->ref_list[0][ref0].poc;