[SCM] libav/experimental: Move initialization of {luma, chroma}_weight_flag[] up, to make sure they are always initialized. Patch by Gwenole Beauchesne g${name} splitted-desktop com
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:38:37 UTC 2013
The following commit has been merged in the experimental branch:
commit ce09f9270a8bf43212dad58fcb73fee2900c364f
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date: Tue Feb 17 13:41:27 2009 +0000
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 c1e3cfa..cb27476 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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list