From: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Tue, 17 Feb 2009 13:41:27 +0000 (+0000)
Subject: Move initialization of {luma,chroma}_weight_flag[] up,
X-Git-Tag: v0.5~356
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce09f9270a8bf43212dad58fcb73fee2900c364f;p=coroid%2Fffmpeg_saccubus.git

Move initialization of {luma,chroma}_weight_flag[] up,
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
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c1e3cfaff..cb27476ea 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3046,6 +3046,11 @@ static void implicit_weight_table(H264Context *h){
     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 @@ static void implicit_weight_table(H264Context *h){
     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;