[FFmpeg-cvslog] r26377 - trunk/libavcodec/h264_cabac.c
darkshikari
subversion
Sat Jan 15 19:14:36 CET 2011
Author: darkshikari
Date: Sat Jan 15 19:14:36 2011
New Revision: 26377
Log:
Remove evil timers that snuck their way into r26375.
Modified:
trunk/libavcodec/h264_cabac.c
Modified: trunk/libavcodec/h264_cabac.c
==============================================================================
--- trunk/libavcodec/h264_cabac.c Sat Jan 15 19:13:40 2011 (r26376)
+++ trunk/libavcodec/h264_cabac.c Sat Jan 15 19:14:36 2011 (r26377)
@@ -1192,7 +1192,6 @@ static av_always_inline void decode_caba
* @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;
}
More information about the ffmpeg-cvslog
mailing list