diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-15 18:14:36 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-15 18:14:36 +0000 |
| commit | b9af15402d0013ca60a735d2f8a2898487cf1ca0 (patch) | |
| tree | e956c0958306a5bb3b3a60db2d675f212fb083c7 /libavcodec/h264_cabac.c | |
| parent | fb2734c8a60f275f17a95ae413dd38b5c616bc1a (diff) | |
| download | ffmpeg-b9af15402d0013ca60a735d2f8a2898487cf1ca0.tar.gz | |
Remove evil timers that snuck their way into r26375.
Originally committed as revision 26377 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index f8083808e7..5aad4d7f58 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1192,7 +1192,6 @@ static av_always_inline void decode_cabac_residual_nondc( H264Context *h, DCTELE * @return 0 if OK, AC_ERROR / DC_ERROR / MV_ERROR if an error is noticed */ int ff_h264_decode_mb_cabac(H264Context *h) { - START_TIMER; MpegEncContext * const s = &h->s; int mb_xy; int mb_type, partition_count, cbp = 0; @@ -1725,6 +1724,6 @@ decode_intra_mb: h->ref_count[0] >>= 1; h->ref_count[1] >>= 1; } -STOP_TIMER("test"); + return 0; } |