revert r1783

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

1 files changed, 10 insertions, 18 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c
index 83179301d..6b8ed4f75 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/huffman.c
@@ -33,21 +33,18 @@ static void get_tree_codes(uint32_t *bits, int16_t *lens, uint8_t *xlat, Node *n
     int s;

 

     s = nodes[node].sym;

-    if(s != HNODE || (no_zero_count && !nodes[node].count))

-    {

+    if(s != HNODE || (no_zero_count && !nodes[node].count)){

         bits[*pos] = pfx;

         lens[*pos] = pl;

         xlat[*pos] = s;

         (*pos)++;

-    }

-    else

-    {

+    }else{

         pfx <<= 1;

         pl++;

         get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0, pfx, pl, pos,

                        no_zero_count);

         pfx |= 1;

-        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0 + 1, pfx, pl, pos,

+        get_tree_codes(bits, lens, xlat, nodes, nodes[node].n0+1, pfx, pl, pos,

                        no_zero_count);

     }

 }

@@ -76,40 +73,35 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes,
     int cur_node;

     int64_t sum = 0;

 

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

-    {

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

         nodes[i].sym = i;

         nodes[i].n0 = -2;

         sum += nodes[i].count;

     }

 

-    if(sum >> 31)

-    {

+    if(sum >> 31) {

         av_log(avctx, AV_LOG_ERROR, "Too high symbol frequencies. Tree construction is not possible\n");

         return -1;

     }

     qsort(nodes, nb_codes, sizeof(Node), cmp);

     cur_node = nb_codes;

     nodes[nb_codes*2-1].count = 0;

-    for(i = 0; i < nb_codes * 2 - 1; i += 2)

-    {

+    for(i = 0; i < nb_codes*2-1; i += 2){

         nodes[cur_node].sym = HNODE;

         nodes[cur_node].count = nodes[i].count + nodes[i+1].count;

         nodes[cur_node].n0 = i;

-        for(j = cur_node; j > 0; j--)

-        {

+        for(j = cur_node; j > 0; j--){

             if(nodes[j].count > nodes[j-1].count ||

                (nodes[j].count == nodes[j-1].count &&

                 (!(flags & FF_HUFFMAN_FLAG_HNODE_FIRST) ||

-                 nodes[j].n0 == j - 1 || nodes[j].n0 == j - 2 ||

-                 (nodes[j].sym != HNODE && nodes[j-1].sym != HNODE))))

+                 nodes[j].n0==j-1 || nodes[j].n0==j-2 ||

+                 (nodes[j].sym!=HNODE && nodes[j-1].sym!=HNODE))))

                 break;

             FFSWAP(Node, nodes[j], nodes[j-1]);

         }

         cur_node++;

     }

-    if(build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags) < 0)

-    {

+    if(build_huff_tree(vlc, nodes, nb_codes*2-2, flags) < 0){

         av_log(avctx, AV_LOG_ERROR, "Error building tree\n");

         return -1;

     }