diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 14:04:14 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-16 14:04:14 +0200 |
commit | 83962004f7275a4ea98ca02398ae5dfff59e5fb7 (patch) | |
tree | 38ba41a2750d220f95a58b7b3ca6cb540e7fddf5 /libavcodec/rangecoder.c | |
parent | 5717562c789f9be9c8e4bab7caec4df83f77cebe (diff) | |
parent | 3dc06b6972cf389269e9c36ff0a4373f80f7149b (diff) | |
download | ffmpeg-streaming-83962004f7275a4ea98ca02398ae5dfff59e5fb7.zip ffmpeg-streaming-83962004f7275a4ea98ca02398ae5dfff59e5fb7.tar.gz |
Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
tiny_psnr: check for specified sample size less than 1
fate: improve md5sum utility selection
rangecoder-test: Drop timer output that clutters stderr
Conflicts:
tests/tiny_psnr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rangecoder.c')
-rw-r--r-- | libavcodec/rangecoder.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavcodec/rangecoder.c b/libavcodec/rangecoder.c index 33984aa..7d2d14d 100644 --- a/libavcodec/rangecoder.c +++ b/libavcodec/rangecoder.c @@ -137,11 +137,8 @@ int main(void) for (i = 0; i < SIZE; i++) r[i] = av_lfg_get(&prng) % 7; - for (i = 0; i < SIZE; i++) { -START_TIMER + for (i = 0; i < SIZE; i++) put_rac(&c, state, r[i] & 1); -STOP_TIMER("put_rac") - } ff_rac_terminate(&c); @@ -149,14 +146,11 @@ STOP_TIMER("put_rac") memset(state, 128, sizeof(state)); - for (i = 0; i < SIZE; i++) { -START_TIMER + for (i = 0; i < SIZE; i++) if ((r[i] & 1) != get_rac(&c, state)) { av_log(NULL, AV_LOG_ERROR, "rac failure at %d\n", i); return 1; } -STOP_TIMER("get_rac") - } return 0; } |