[SCM] libav/experimental: Move restore_ac_coeffs() up so its declared before its use.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:56:57 UTC 2013


The following commit has been merged in the experimental branch:
commit 0dc5dc08db8aa8f0c05376bc93be979bf76a0bb5
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Thu Jan 7 15:24:50 2010 +0000

    Move restore_ac_coeffs() up so its declared before its use.
    
    Originally committed as revision 21061 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 6df9be7..5b0ea56 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -368,6 +368,29 @@ static inline int get_block_rate(MpegEncContext * s, DCTELEM block[64], int bloc
     return rate;
 }
 
+static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6])
+{
+    int i, n;
+    memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6);
+
+    for(n=0; n<6; n++){
+        int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
+
+        st[n]= s->intra_scantable.permutated;
+        if(dir[n]){
+            /* top prediction */
+            for(i=1; i<8; i++){
+                block[n][s->dsp.idct_permutation[i   ]] = ac_val[i+8];
+            }
+        }else{
+            /* left prediction */
+            for(i=1; i<8; i++){
+                block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i  ];
+            }
+        }
+    }
+}
+
 /**
  * Returns the optimal value (0 or 1) for the ac_pred element for the given MB in mpeg4.
  */
@@ -442,29 +465,6 @@ static inline int decide_ac_pred(MpegEncContext * s, DCTELEM block[6][64], int d
     return score < 0;
 }
 
-static inline void restore_ac_coeffs(MpegEncContext * s, DCTELEM block[6][64], int dir[6], uint8_t *st[6], int zigzag_last_index[6])
-{
-    int i, n;
-    memcpy(s->block_last_index, zigzag_last_index, sizeof(int)*6);
-
-    for(n=0; n<6; n++){
-        int16_t *ac_val = s->ac_val[0][0] + s->block_index[n] * 16;
-
-        st[n]= s->intra_scantable.permutated;
-        if(dir[n]){
-            /* top prediction */
-            for(i=1; i<8; i++){
-                block[n][s->dsp.idct_permutation[i   ]] = ac_val[i+8];
-            }
-        }else{
-            /* left prediction */
-            for(i=1; i<8; i++){
-                block[n][s->dsp.idct_permutation[i<<3]]= ac_val[i  ];
-            }
-        }
-    }
-}
-
 /**
  * modify qscale so that encoding is acually possible in h263 (limit difference to -2..2)
  */

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list