Mercurial > libavcodec.hg

changeset 8956:de631175196e libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move initialization of {luma,chroma}_weight_flag[] up, to make sure they are always initialized. Patch by Gwenole Beauchesne g${name} splitted-desktop com
author benoit
date Tue, 17 Feb 2009 13:41:27 +0000
parents e03f0d4f9e3d
children 9396eb8808ca
files h264.c
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Tue Feb 17 12:11:46 2009 +0000
+++ b/h264.c	Tue Feb 17 13:41:27 2009 +0000
@@ -3046,6 +3046,11 @@
     int ref0, ref1, i;
     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
        && h->ref_list[0][0].poc + h->ref_list[1][0].poc == 2*cur_poc){
         h->use_weight= 0;
@@ -3057,10 +3062,6 @@
     h->use_weight_chroma= 2;
     h->luma_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++){
         int poc0 = h->ref_list[0][ref0].poc;