diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-12 01:42:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-12 01:42:32 +0200 |
| commit | e10979ff5624248dc86780443df9ebd8cc48e246 (patch) | |
| tree | 9ee75c3d4d0dd42846cfb2a3cd439bece1f20479 /libavutil | |
| parent | a8c2ff2c3cc5f28c36692031c342692cac742280 (diff) | |
| parent | b047941d7da470ba0dcedb1fd0aa828075265ffc (diff) | |
| download | ffmpeg-e10979ff5624248dc86780443df9ebd8cc48e246.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
changelog: misc typo and wording fixes
H.264: add filter_mb_fast support for >8-bit decoding
doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
lls: use av_lfg instead of rand() in test program
build: remove unnecessary dependency on libs from 'all' target
H.264: avoid redundant alpha/beta calculations in loopfilter
H.264: optimize intra/inter loopfilter decision
mpegts: fix Continuity Counter error detection
build: remove unnecessary FFLDFLAGS variable
vp8/mt: flush worker thread, not application thread context, on seek.
mt: proper locking around release_buffer calls.
DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e]
hwaccel: unbreak build
Eliminate FF_COMMON_FRAME macro.
Conflicts:
Changelog
Makefile
doc/developer.texi
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/mpeg4videodec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/lls.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/libavutil/lls.c b/libavutil/lls.c index 5f59db6ea3..dcefc2cbad 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -118,24 +118,27 @@ double av_evaluate_lls(LLSModel *m, double *param, int order) #ifdef TEST -#include <stdlib.h> #include <stdio.h> +#include <limits.h> +#include "lfg.h" int main(void) { LLSModel m; int i, order; + AVLFG lfg; + av_lfg_init(&lfg, 1); av_init_lls(&m, 3); for (i = 0; i < 100; i++) { double var[4]; double eval; - var[0] = (rand() / (double) RAND_MAX - 0.5) * 2; - var[1] = var[0] + rand() / (double) RAND_MAX - 0.5; - var[2] = var[1] + rand() / (double) RAND_MAX - 0.5; - var[3] = var[2] + rand() / (double) RAND_MAX - 0.5; + var[0] = (av_lfg_get(&lfg) / (double) UINT_MAX - 0.5) * 2; + var[1] = var[0] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[2] = var[1] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; + var[3] = var[2] + av_lfg_get(&lfg) / (double) UINT_MAX - 0.5; av_update_lls(&m, var, 0.99); av_solve_lls(&m, 0.001, 0); for (order = 0; order < 3; order++) { |