[SCM] libav/experimental: Remove evil timers that snuck their way into r26375.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:22:01 UTC 2013
The following commit has been merged in the experimental branch:
commit b9af15402d0013ca60a735d2f8a2898487cf1ca0
Author: Jason Garrett-Glaser <darkshikari at gmail.com>
Date: Sat Jan 15 18:14:36 2011 +0000
Remove evil timers that snuck their way into r26375.
Originally committed as revision 26377 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index f808380..5aad4d7 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;
}
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list