[FFmpeg-cvslog] r21061 - trunk/libavcodec/h263.c

michael subversion
Thu Jan 7 16:24:50 CET 2010


Author: michael
Date: Thu Jan  7 16:24:50 2010
New Revision: 21061

Log:
Move restore_ac_coeffs() up so its declared before its use.

Modified:
   trunk/libavcodec/h263.c

Modified: trunk/libavcodec/h263.c
==============================================================================
--- trunk/libavcodec/h263.c	Thu Jan  7 16:12:31 2010	(r21060)
+++ trunk/libavcodec/h263.c	Thu Jan  7 16:24:50 2010	(r21061)
@@ -368,6 +368,29 @@ static inline int get_block_rate(MpegEnc
     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(MpegEnc
     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)
  */



More information about the ffmpeg-cvslog mailing list