[SCM] libav/experimental: Fix 100L in r24689 Accidentally committed some timing code.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:13:33 UTC 2013
The following commit has been merged in the experimental branch:
commit ffbf0794f9b7ca1b9c3038c5c1aed84fbf1f8529
Author: Jason Garrett-Glaser <darkshikari at gmail.com>
Date: Wed Aug 4 01:40:58 2010 +0000
Fix 100L in r24689
Accidentally committed some timing code.
Originally committed as revision 24690 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 372d266..ac12ad1 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -910,9 +910,9 @@ void decode_mb_coeffs(VP8Context *s, VP56RangeCoder *c, VP8Macroblock *mb,
// luma blocks
for (y = 0; y < 4; y++)
for (x = 0; x < 4; x++) {
- nnz_pred = l_nnz[y] + t_nnz[x];START_TIMER;
+ nnz_pred = l_nnz[y] + t_nnz[x];
nnz = decode_block_coeffs(c, s->block[y][x], s->prob->token[luma_ctx], luma_start,
- nnz_pred, s->qmat[segment].luma_qmul);STOP_TIMER("test");
+ nnz_pred, s->qmat[segment].luma_qmul);
// nnz+block_dc may be one more than the actual last index, but we don't care
s->non_zero_count_cache[y][x] = nnz + block_dc;
t_nnz[x] = l_nnz[y] = !!nnz;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list