[libav-devel] [PATCH 14/15] vc1dec: Factorize lut clean code

[Martin Storsjö]

From: Michael Niedermayer <michae...@gmx.at>

---
 libavcodec/vc1.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 9f72513..4ee4fc9 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -610,6 +610,10 @@ static void rotate_luts(VC1Context *v)
     ROTATE(int tmp            , v->last_use_ic, v->next_use_ic, 
v->curr_use_ic, v->aux_use_ic);
     ROTATE(uint8_t tmp[2][256], v->last_luty,   v->next_luty,   v->curr_luty,  
 v->aux_luty);
     ROTATE(uint8_t tmp[2][256], v->last_lutuv,  v->next_lutuv,  v->curr_lutuv, 
 v->aux_lutuv);
+
+    INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
+    INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
+    v->curr_use_ic = 0;
 }
 
 int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* gb)
@@ -700,9 +704,6 @@ int ff_vc1_parse_frame_header(VC1Context *v, GetBitContext* 
gb)
 
     if (v->first_pic_header_flag) {
         rotate_luts(v);
-        INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
-        INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
-        v->curr_use_ic = 0;
     }
 
     switch (v->s.pict_type) {
@@ -970,9 +971,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, 
GetBitContext* gb)
 
     if (v->first_pic_header_flag) {
         rotate_luts(v);
-        INIT_LUT(32, 0, v->curr_luty[0], v->curr_lutuv[0], 0);
-        INIT_LUT(32, 0, v->curr_luty[1], v->curr_lutuv[1], 0);
-        v->curr_use_ic = 0;
     }
 
     switch (v->s.pict_type) {
-- 
1.7.9.4

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel