revert r1783

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

1 files changed, 18 insertions, 30 deletions

diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h
index 2efd2ab40..61d64cd1c 100644
--- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h
+++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/jpegls.h
@@ -30,20 +30,18 @@
 

 #include "avcodec.h"

 

-typedef struct JpeglsContext

-{

+typedef struct JpeglsContext{

     AVCodecContext *avctx;

     AVFrame picture;

-} JpeglsContext;

+}JpeglsContext;

 

-typedef struct JLSState

-{

+typedef struct JLSState{

     int T1, T2, T3;

     int A[367], B[367], C[365], N[367];

     int limit, reset, bpp, qbpp, maxval, range;

     int near, twonear;

     int run_index[3];

-} JLSState;

+}JLSState;

 

 extern const uint8_t ff_log2_run[32];

 

@@ -55,19 +53,15 @@ void ff_jpegls_init_state(JLSState *state);
 /**

  * Calculate quantized gradient value, used for context determination

  */

-static inline int ff_jpegls_quantize(JLSState *s, int v)  //FIXME optimize

-{

-    if(v == 0) return 0;

-    if(v < 0)

-    {

+static inline int ff_jpegls_quantize(JLSState *s, int v){ //FIXME optimize

+    if(v==0) return 0;

+    if(v < 0){

         if(v <= -s->T3) return -4;

         if(v <= -s->T2) return -3;

         if(v <= -s->T1) return -2;

         if(v <  -s->near) return -1;

         return 0;

-    }

-    else

-    {

+    }else{

         if(v <= s->near) return 0;

         if(v <  s->T1) return 1;

         if(v <  s->T2) return 2;

@@ -82,34 +76,28 @@ static inline int ff_jpegls_quantize(JLSState *s, int v)  //FIXME optimize
 void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all);

 

 

-static inline void ff_jpegls_downscale_state(JLSState *state, int Q)

-{

-    if(state->N[Q] == state->reset)

-    {

-        state->A[Q] >>= 1;

-        state->B[Q] >>= 1;

-        state->N[Q] >>= 1;

+static inline void ff_jpegls_downscale_state(JLSState *state, int Q){

+    if(state->N[Q] == state->reset){

+        state->A[Q] >>=1;

+        state->B[Q] >>=1;

+        state->N[Q] >>=1;

     }

     state->N[Q]++;

 }

 

-static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err)

-{

+static inline int ff_jpegls_update_state_regular(JLSState *state, int Q, int err){

     state->A[Q] += FFABS(err);

     err *= state->twonear;

     state->B[Q] += err;

 

     ff_jpegls_downscale_state(state, Q);

 

-    if(state->B[Q] <= -state->N[Q])

-    {

-        state->B[Q] = FFMAX(state->B[Q] + state->N[Q], 1 - state->N[Q]);

+    if(state->B[Q] <= -state->N[Q]) {

+        state->B[Q]= FFMAX(state->B[Q] + state->N[Q], 1-state->N[Q]);

         if(state->C[Q] > -128)

             state->C[Q]--;

-    }

-    else if(state->B[Q] > 0)

-    {

-        state->B[Q] = FFMIN(state->B[Q] - state->N[Q], 0);

+    }else if(state->B[Q] > 0){

+        state->B[Q]= FFMIN(state->B[Q] - state->N[Q], 0);

         if(state->C[Q] < 127)

             state->C[Q]++;

     }