revert r1783

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 172 insertions, 247 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2dec.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2dec.c
index 29c0c4406..232099ecd 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2dec.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/wmv2dec.c
@@ -29,67 +29,49 @@
 #include "wmv2.h"

 

 

-static void parse_mb_skip(Wmv2Context * w)

-{

+static void parse_mb_skip(Wmv2Context * w){

     int mb_x, mb_y;

-    MpegEncContext * const s = &w->s;

-    uint32_t * const mb_type = s->current_picture_ptr->mb_type;

+    MpegEncContext * const s= &w->s;

+    uint32_t * const mb_type= s->current_picture_ptr->mb_type;

 

-    w->skip_type = get_bits(&s->gb, 2);

-    switch(w->skip_type)

-    {

+    w->skip_type= get_bits(&s->gb, 2);

+    switch(w->skip_type){

     case SKIP_TYPE_NONE:

-        for(mb_y = 0; mb_y < s->mb_height; mb_y++)

-        {

-            for(mb_x = 0; mb_x < s->mb_width; mb_x++)

-            {

-                mb_type[mb_y*s->mb_stride + mb_x] = MB_TYPE_16x16 | MB_TYPE_L0;

+        for(mb_y=0; mb_y<s->mb_height; mb_y++){

+            for(mb_x=0; mb_x<s->mb_width; mb_x++){

+                mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_16x16 | MB_TYPE_L0;

             }

         }

         break;

     case SKIP_TYPE_MPEG:

-        for(mb_y = 0; mb_y < s->mb_height; mb_y++)

-        {

-            for(mb_x = 0; mb_x < s->mb_width; mb_x++)

-            {

-                mb_type[mb_y*s->mb_stride + mb_x] = (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

+        for(mb_y=0; mb_y<s->mb_height; mb_y++){

+            for(mb_x=0; mb_x<s->mb_width; mb_x++){

+                mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

             }

         }

         break;

     case SKIP_TYPE_ROW:

-        for(mb_y = 0; mb_y < s->mb_height; mb_y++)

-        {

-            if(get_bits1(&s->gb))

-            {

-                for(mb_x = 0; mb_x < s->mb_width; mb_x++)

-                {

-                    mb_type[mb_y*s->mb_stride + mb_x] =  MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;

+        for(mb_y=0; mb_y<s->mb_height; mb_y++){

+            if(get_bits1(&s->gb)){

+                for(mb_x=0; mb_x<s->mb_width; mb_x++){

+                    mb_type[mb_y*s->mb_stride + mb_x]=  MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;

                 }

-            }

-            else

-            {

-                for(mb_x = 0; mb_x < s->mb_width; mb_x++)

-                {

-                    mb_type[mb_y*s->mb_stride + mb_x] = (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

+            }else{

+                for(mb_x=0; mb_x<s->mb_width; mb_x++){

+                    mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

                 }

             }

         }

         break;

     case SKIP_TYPE_COL:

-        for(mb_x = 0; mb_x < s->mb_width; mb_x++)

-        {

-            if(get_bits1(&s->gb))

-            {

-                for(mb_y = 0; mb_y < s->mb_height; mb_y++)

-                {

-                    mb_type[mb_y*s->mb_stride + mb_x] =  MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;

+        for(mb_x=0; mb_x<s->mb_width; mb_x++){

+            if(get_bits1(&s->gb)){

+                for(mb_y=0; mb_y<s->mb_height; mb_y++){

+                    mb_type[mb_y*s->mb_stride + mb_x]=  MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;

                 }

-            }

-            else

-            {

-                for(mb_y = 0; mb_y < s->mb_height; mb_y++)

-                {

-                    mb_type[mb_y*s->mb_stride + mb_x] = (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

+            }else{

+                for(mb_y=0; mb_y<s->mb_height; mb_y++){

+                    mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;

                 }

             }

         }

@@ -97,146 +79,129 @@ static void parse_mb_skip(Wmv2Context * w)
     }

 }

 

-static int decode_ext_header(Wmv2Context *w)

-{

-    MpegEncContext * const s = &w->s;

+static int decode_ext_header(Wmv2Context *w){

+    MpegEncContext * const s= &w->s;

     GetBitContext gb;

     int fps;

     int code;

 

-    if(s->avctx->extradata_size < 4) return -1;

+    if(s->avctx->extradata_size<4) return -1;

 

-    init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size * 8);

+    init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);

 

     fps                = get_bits(&gb, 5);

-    s->bit_rate        = get_bits(&gb, 11) * 1024;

+    s->bit_rate        = get_bits(&gb, 11)*1024;

     w->mspel_bit       = get_bits1(&gb);

     s->loop_filter     = get_bits1(&gb);

     w->abt_flag        = get_bits1(&gb);

     w->j_type_bit      = get_bits1(&gb);

-    w->top_left_mv_flag = get_bits1(&gb);

+    w->top_left_mv_flag= get_bits1(&gb);

     w->per_mb_rl_bit   = get_bits1(&gb);

     code               = get_bits(&gb, 3);

 

-    if(code == 0) return -1;

+    if(code==0) return -1;

 

     s->slice_height = s->mb_height / code;

 

-    if(s->avctx->debug & FF_DEBUG_PICT_INFO)

-    {

+    if(s->avctx->debug&FF_DEBUG_PICT_INFO){

         av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, loop_filter:%d, slices:%d\n",

-               fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, s->loop_filter,

-               code);

+        fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, s->loop_filter,

+        code);

     }

     return 0;

 }

 

 int ff_wmv2_decode_picture_header(MpegEncContext * s)

 {

-    Wmv2Context * const w = (Wmv2Context*)s;

+    Wmv2Context * const w= (Wmv2Context*)s;

     int code;

 

 #if 0

-    {

-        int i;

-        for(i = 0; i < s->gb.size * 8; i++)

-            printf("%d", get_bits1(&s->gb));

+{

+int i;

+for(i=0; i<s->gb.size*8; i++)

+    printf("%d", get_bits1(&s->gb));

 //    get_bits1(&s->gb);

-        printf("END\n");

-        return -1;

-    }

+printf("END\n");

+return -1;

+}

 #endif

-    if(s->picture_number == 0)

+    if(s->picture_number==0)

         decode_ext_header(w);

 

     s->pict_type = get_bits1(&s->gb) + 1;

-    if(s->pict_type == FF_I_TYPE)

-    {

+    if(s->pict_type == FF_I_TYPE){

         code = get_bits(&s->gb, 7);

         av_log(s->avctx, AV_LOG_DEBUG, "I7:%X/\n", code);

     }

-    s->chroma_qscale = s->qscale = get_bits(&s->gb, 5);

+    s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);

     if(s->qscale <= 0)

-        return -1;

+       return -1;

 

     return 0;

 }

 

 int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)

 {

-    Wmv2Context * const w = (Wmv2Context*)s;

+    Wmv2Context * const w= (Wmv2Context*)s;

 

-    if(s->pict_type == FF_I_TYPE)

-    {

-        if(w->j_type_bit) w->j_type = get_bits1(&s->gb);

-        else              w->j_type = 0; //FIXME check

+    if (s->pict_type == FF_I_TYPE) {

+        if(w->j_type_bit) w->j_type= get_bits1(&s->gb);

+        else              w->j_type= 0; //FIXME check

 

-        if(!w->j_type)

-        {

-            if(w->per_mb_rl_bit) s->per_mb_rl_table = get_bits1(&s->gb);

-            else                 s->per_mb_rl_table = 0;

+        if(!w->j_type){

+            if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);

+            else                 s->per_mb_rl_table= 0;

 

-            if(!s->per_mb_rl_table)

-            {

+            if(!s->per_mb_rl_table){

                 s->rl_chroma_table_index = decode012(&s->gb);

                 s->rl_table_index = decode012(&s->gb);

             }

 

             s->dc_table_index = get_bits1(&s->gb);

         }

-        s->inter_intra_pred = 0;

+        s->inter_intra_pred= 0;

         s->no_rounding = 1;

-        if(s->avctx->debug & FF_DEBUG_PICT_INFO)

-        {

+        if(s->avctx->debug&FF_DEBUG_PICT_INFO){

             av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n",

-                   s->qscale,

-                   s->rl_chroma_table_index,

-                   s->rl_table_index,

-                   s->dc_table_index,

-                   s->per_mb_rl_table,

-                   w->j_type);

+                s->qscale,

+                s->rl_chroma_table_index,

+                s->rl_table_index,

+                s->dc_table_index,

+                s->per_mb_rl_table,

+                w->j_type);

         }

-    }

-    else

-    {

+    }else{

         int cbp_index;

-        w->j_type = 0;

+        w->j_type=0;

 

         parse_mb_skip(w);

-        cbp_index = decode012(&s->gb);

-        if(s->qscale <= 10)

-        {

-            int map[3] = {0, 2, 1};

-            w->cbp_table_index = map[cbp_index];

-        }

-        else if(s->qscale <= 20)

-        {

-            int map[3] = {1, 0, 2};

-            w->cbp_table_index = map[cbp_index];

-        }

-        else

-        {

-            int map[3] = {2, 1, 0};

-            w->cbp_table_index = map[cbp_index];

+        cbp_index= decode012(&s->gb);

+        if(s->qscale <= 10){

+            int map[3]= {0,2,1};

+            w->cbp_table_index= map[cbp_index];

+        }else if(s->qscale <= 20){

+            int map[3]= {1,0,2};

+            w->cbp_table_index= map[cbp_index];

+        }else{

+            int map[3]= {2,1,0};

+            w->cbp_table_index= map[cbp_index];

         }

 

-        if(w->mspel_bit) s->mspel = get_bits1(&s->gb);

-        else             s->mspel = 0; //FIXME check

+        if(w->mspel_bit) s->mspel= get_bits1(&s->gb);

+        else             s->mspel= 0; //FIXME check

 

-        if(w->abt_flag)

-        {

-            w->per_mb_abt = get_bits1(&s->gb) ^ 1;

-            if(!w->per_mb_abt)

-            {

-                w->abt_type = decode012(&s->gb);

+        if(w->abt_flag){

+            w->per_mb_abt= get_bits1(&s->gb)^1;

+            if(!w->per_mb_abt){

+                w->abt_type= decode012(&s->gb);

             }

         }

 

-        if(w->per_mb_rl_bit) s->per_mb_rl_table = get_bits1(&s->gb);

-        else                 s->per_mb_rl_table = 0;

+        if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);

+        else                 s->per_mb_rl_table= 0;

 

-        if(!s->per_mb_rl_table)

-        {

+        if(!s->per_mb_rl_table){

             s->rl_table_index = decode012(&s->gb);

             s->rl_chroma_table_index = s->rl_table_index;

         }

@@ -244,62 +209,58 @@ int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
         s->dc_table_index = get_bits1(&s->gb);

         s->mv_table_index = get_bits1(&s->gb);

 

-        s->inter_intra_pred = 0; //(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);

+        s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);

         s->no_rounding ^= 1;

 

-        if(s->avctx->debug & FF_DEBUG_PICT_INFO)

-        {

+        if(s->avctx->debug&FF_DEBUG_PICT_INFO){

             av_log(s->avctx, AV_LOG_DEBUG, "rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d mspel:%d per_mb_abt:%d abt_type:%d cbp:%d ii:%d\n",

-                   s->rl_table_index,

-                   s->rl_chroma_table_index,

-                   s->dc_table_index,

-                   s->mv_table_index,

-                   s->per_mb_rl_table,

-                   s->qscale,

-                   s->mspel,

-                   w->per_mb_abt,

-                   w->abt_type,

-                   w->cbp_table_index,

-                   s->inter_intra_pred);

+                s->rl_table_index,

+                s->rl_chroma_table_index,

+                s->dc_table_index,

+                s->mv_table_index,

+                s->per_mb_rl_table,

+                s->qscale,

+                s->mspel,

+                w->per_mb_abt,

+                w->abt_type,

+                w->cbp_table_index,

+                s->inter_intra_pred);

         }

     }

-    s->esc3_level_length = 0;

-    s->esc3_run_length = 0;

+    s->esc3_level_length= 0;

+    s->esc3_run_length= 0;

 

-    s->picture_number++; //FIXME ?

+s->picture_number++; //FIXME ?

 

 

-    if(w->j_type)

-    {

-        ff_intrax8_decode_picture(&w->x8, 2 * s->qscale, (s->qscale - 1) | 1);

+    if(w->j_type){

+        ff_intrax8_decode_picture(&w->x8, 2*s->qscale, (s->qscale-1)|1 );

         return 1;

     }

 

     return 0;

 }

 

-static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr)

-{

-    MpegEncContext * const s = &w->s;

+static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){

+    MpegEncContext * const s= &w->s;

     int ret;

 

-    ret = ff_msmpeg4_decode_motion(s, mx_ptr, my_ptr);

+    ret= ff_msmpeg4_decode_motion(s, mx_ptr, my_ptr);

 

-    if(ret < 0) return -1;

+    if(ret<0) return -1;

 

-    if((((*mx_ptr) | (*my_ptr)) & 1) && s->mspel)

-        w->hshift = get_bits1(&s->gb);

+    if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel)

+        w->hshift= get_bits1(&s->gb);

     else

-        w->hshift = 0;

+        w->hshift= 0;

 

 //printf("%d %d  ", *mx_ptr, *my_ptr);

 

     return 0;

 }

 

-static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py)

-{

-    MpegEncContext * const s = &w->s;

+static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){

+    MpegEncContext * const s= &w->s;

     int xy, wrap, diff, type;

     int16_t *A, *B, *C, *mot_val;

 

@@ -313,35 +274,27 @@ static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py)
     C = s->current_picture.motion_val[0][xy + 2 - wrap];

 

     if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag)

-        diff = FFMAX(FFABS(A[0] - B[0]), FFABS(A[1] - B[1]));

+        diff= FFMAX(FFABS(A[0] - B[0]), FFABS(A[1] - B[1]));

     else

-        diff = 0;

+        diff=0;

 

     if(diff >= 8)

-        type = get_bits1(&s->gb);

-    else

-        type = 2;

-

-    if(type == 0)

-    {

-        *px = A[0];

-        *py = A[1];

-    }

-    else if(type == 1)

-    {

-        *px = B[0];

-        *py = B[1];

-    }

+        type= get_bits1(&s->gb);

     else

-    {

+        type= 2;

+

+    if(type == 0){

+        *px= A[0];

+        *py= A[1];

+    }else if(type == 1){

+        *px= B[0];

+        *py= B[1];

+    }else{

         /* special case for first (slice) line */

-        if(s->first_slice_line)

-        {

+        if (s->first_slice_line) {

             *px = A[0];

             *py = A[1];

-        }

-        else

-        {

+        } else {

             *px = mid_pred(A[0], B[0], C[0]);

             *py = mid_pred(A[1], B[1], C[1]);

         }

@@ -350,53 +303,46 @@ static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py)
     return mot_val;

 }

 

-static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp)

-{

-    MpegEncContext * const s = &w->s;

-    static const int sub_cbp_table[3] = {2, 3, 1};

+static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){

+    MpegEncContext * const s= &w->s;

+    static const int sub_cbp_table[3]= {2,3,1};

     int sub_cbp;

 

-    if(!cbp)

-    {

+    if(!cbp){

         s->block_last_index[n] = -1;

 

         return 0;

     }

 

     if(w->per_block_abt)

-        w->abt_type = decode012(&s->gb);

+        w->abt_type= decode012(&s->gb);

 #if 0

     if(w->per_block_abt)

         printf("B%d", w->abt_type);

 #endif

-    w->abt_type_table[n] = w->abt_type;

+    w->abt_type_table[n]= w->abt_type;

 

-    if(w->abt_type)

-    {

+    if(w->abt_type){

 //        const uint8_t *scantable= w->abt_scantable[w->abt_type-1].permutated;

-        const uint8_t *scantable = w->abt_scantable[w->abt_type-1].scantable;

+        const uint8_t *scantable= w->abt_scantable[w->abt_type-1].scantable;

 //        const uint8_t *scantable= w->abt_type-1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable;

 

-        sub_cbp = sub_cbp_table[ decode012(&s->gb)];

+        sub_cbp= sub_cbp_table[ decode012(&s->gb) ];

 //        printf("S%d", sub_cbp);

 

-        if(sub_cbp & 1)

-        {

-            if(ff_msmpeg4_decode_block(s, block, n, 1, scantable) < 0)

+        if(sub_cbp&1){

+            if (ff_msmpeg4_decode_block(s, block, n, 1, scantable) < 0)

                 return -1;

         }

 

-        if(sub_cbp & 2)

-        {

-            if(ff_msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)

+        if(sub_cbp&2){

+            if (ff_msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)

                 return -1;

         }

         s->block_last_index[n] = 63;

 

         return 0;

-    }

-    else

-    {

+    }else{

         return ff_msmpeg4_decode_block(s, block, n, 1, s->inter_scantable.permutated);

     }

 }

@@ -404,52 +350,45 @@ static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n,
 

 int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])

 {

-    Wmv2Context * const w = (Wmv2Context*)s;

+    Wmv2Context * const w= (Wmv2Context*)s;

     int cbp, code, i;

     uint8_t *coded_val;

 

     if(w->j_type) return 0;

 

-    if(s->pict_type == FF_P_TYPE)

-    {

-        if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x]))

-        {

+    if (s->pict_type == FF_P_TYPE) {

+        if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){

             /* skip mb */

             s->mb_intra = 0;

-            for(i = 0; i < 6; i++)

+            for(i=0;i<6;i++)

                 s->block_last_index[i] = -1;

             s->mv_dir = MV_DIR_FORWARD;

             s->mv_type = MV_TYPE_16X16;

             s->mv[0][0][0] = 0;

             s->mv[0][0][1] = 0;

             s->mb_skipped = 1;

-            w->hshift = 0;

+            w->hshift=0;

             return 0;

         }

 

         code = get_vlc2(&s->gb, ff_mb_non_intra_vlc[w->cbp_table_index].table, MB_NON_INTRA_VLC_BITS, 3);

-        if(code < 0)

+        if (code < 0)

             return -1;

         s->mb_intra = (~code & 0x40) >> 6;

 

         cbp = code & 0x3f;

-    }

-    else

-    {

+    } else {

         s->mb_intra = 1;

         code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);

-        if(code < 0)

-        {

+        if (code < 0){

             av_log(s->avctx, AV_LOG_ERROR, "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y);

             return -1;

         }

         /* predict coded block pattern */

         cbp = 0;

-        for(i = 0; i < 6; i++)

-        {

+        for(i=0;i<6;i++) {

             int val = ((code >> (5 - i)) & 1);

-            if(i < 4)

-            {

+            if (i < 4) {

                 int pred = ff_msmpeg4_coded_block_pred(s, i, &coded_val);

                 val = val ^ pred;

                 *coded_val = val;

@@ -458,32 +397,27 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
         }

     }

 

-    if(!s->mb_intra)

-    {

+    if (!s->mb_intra) {

         int mx, my;

 //printf("P at %d %d\n", s->mb_x, s->mb_y);

         wmv2_pred_motion(w, &mx, &my);

 

-        if(cbp)

-        {

+        if(cbp){

             s->dsp.clear_blocks(s->block[0]);

-            if(s->per_mb_rl_table)

-            {

+            if(s->per_mb_rl_table){

                 s->rl_table_index = decode012(&s->gb);

                 s->rl_chroma_table_index = s->rl_table_index;

             }

 

-            if(w->abt_flag && w->per_mb_abt)

-            {

-                w->per_block_abt = get_bits1(&s->gb);

+            if(w->abt_flag && w->per_mb_abt){

+                w->per_block_abt= get_bits1(&s->gb);

                 if(!w->per_block_abt)

-                    w->abt_type = decode012(&s->gb);

-            }

-            else

-                w->per_block_abt = 0;

+                    w->abt_type= decode012(&s->gb);

+            }else

+                w->per_block_abt=0;

         }

 

-        if(wmv2_decode_motion(w, &mx, &my) < 0)

+        if (wmv2_decode_motion(w, &mx, &my) < 0)

             return -1;

 

         s->mv_dir = MV_DIR_FORWARD;

@@ -491,36 +425,30 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
         s->mv[0][0][0] = mx;

         s->mv[0][0][1] = my;

 

-        for(i = 0; i < 6; i++)

-        {

-            if(wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0)

+        for (i = 0; i < 6; i++) {

+            if (wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0)

             {

                 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);

                 return -1;

             }

         }

-    }

-    else

-    {

+    } else {

 //if(s->pict_type==FF_P_TYPE)

 //   printf("%d%d ", s->inter_intra_pred, cbp);

 //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));

         s->ac_pred = get_bits1(&s->gb);

-        if(s->inter_intra_pred)

-        {

-            s->h263_aic_dir = get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);

+        if(s->inter_intra_pred){

+            s->h263_aic_dir= get_vlc2(&s->gb, ff_inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);

 //            printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);

         }

-        if(s->per_mb_rl_table && cbp)

-        {

+        if(s->per_mb_rl_table && cbp){

             s->rl_table_index = decode012(&s->gb);

             s->rl_chroma_table_index = s->rl_table_index;

         }

 

         s->dsp.clear_blocks(s->block[0]);

-        for(i = 0; i < 6; i++)

-        {

-            if(ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)

+        for (i = 0; i < 6; i++) {

+            if (ff_msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)

             {

                 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);

                 return -1;

@@ -531,13 +459,11 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
     return 0;

 }

 

-static av_cold int wmv2_decode_init(AVCodecContext *avctx)

-{

-    Wmv2Context * const w = avctx->priv_data;

+static av_cold int wmv2_decode_init(AVCodecContext *avctx){

+    Wmv2Context * const w= avctx->priv_data;

 

-    if(avctx->idct_algo == FF_IDCT_AUTO)

-    {

-        avctx->idct_algo = FF_IDCT_WMV2;

+    if(avctx->idct_algo==FF_IDCT_AUTO){

+        avctx->idct_algo=FF_IDCT_WMV2;

     }

 

     if(ff_msmpeg4_decode_init(avctx) < 0)

@@ -545,7 +471,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx)
 

     ff_wmv2_common_init(w);

 

-    ff_intrax8_common_init(&w->x8, &w->s);

+    ff_intrax8_common_init(&w->x8,&w->s);

 

     return 0;

 }

@@ -558,8 +484,7 @@ static av_cold int wmv2_decode_end(AVCodecContext *avctx)
     return ff_h263_decode_end(avctx);

 }

 

-AVCodec wmv2_decoder =

-{

+AVCodec wmv2_decoder = {

     "wmv2",

     CODEC_TYPE_VIDEO,

     CODEC_ID_WMV2,