[libav-commits] Place some START_TIMER invocations in separate blocks.

Diego Biurrun git at libav.org
Wed Jan 4 15:15:10 CET 2012


Module: libav
Branch: master
Commit: 00a1cdd2645992c084a6c71746b04babb7cae364

Author:    Diego Biurrun <diego at biurrun.de>
Committer: Diego Biurrun <diego at biurrun.de>
Date:      Tue Jan  3 13:25:25 2012 +0100

Place some START_TIMER invocations in separate blocks.

This fixes compilation failures related to START_TIMER/STOP_TIMER macros and
-Werror=declaration-after-statement.  START_TIMER declares variables and thus
may not be placed after statements outside of a new block.

---

 libavcodec/indeo5.c                |    4 ++--
 libpostproc/postprocess_template.c |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 8b72b1f..019fa2b 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -757,7 +757,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     switch_buffers(ctx);
 
-    //START_TIMER;
+    //{ START_TIMER;
 
     if (ctx->frame_type != FRAMETYPE_NULL) {
         for (p = 0; p < 3; p++) {
@@ -772,7 +772,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         }
     }
 
-    //STOP_TIMER("decode_planes");
+    //STOP_TIMER("decode_planes"); }
 
     if (ctx->frame.data[0])
         avctx->release_buffer(avctx, &ctx->frame);
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index f1122e5..a609ce8 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -2472,7 +2472,7 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
     int64_t dc_mask, eq_mask, both_masks;
     int64_t sums[10*8*2];
     src+= step*3; // src points to begin of the 8x8 Block
-//START_TIMER
+    //{ START_TIMER
     __asm__ volatile(
         "movq %0, %%mm7                         \n\t"
         "movq %1, %%mm6                         \n\t"
@@ -2998,7 +2998,8 @@ static av_always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int st
     STOP_TIMER("step16")
 }else{
     STOP_TIMER("stepX")
-}*/
+}
+    } */
 }
 #endif //HAVE_MMX
 



More information about the libav-commits mailing list