summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorwm4 <nfxjfg@googlemail.com>2015-02-10 13:27:03 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-10 15:45:02 +0100
commit92e3a6fdac73f7e1d69d69717219a7538877d7a0 (patch)
treee454d975939535a3f553a2c5806902fb3a1b096e /libavutil
parent3e18dc235e9cd41f83643af9470270f434363a0a (diff)
avutil: check pixdescs in a different place
Doing this check in avutil_version() is not appropriate. Also, this code is by default disabled (--assert-level is by default 0). A FATE run with defaults will never execute the checks. Move it to the pixelutils test program. Whatever reason there was in avutil_version() not to run this test by default, it should be fine in this test program. This means FATE will run the test by default. (Yes, pixelutils is not strictly the best place for it either, but it's better.) (pixdesc.c also has a small test program, but it's never run by FATE.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/pixelutils.c3
-rw-r--r--libavutil/utils.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/pixelutils.c b/libavutil/pixelutils.c
index 8f0402499e..1ec4fbb0ec 100644
--- a/libavutil/pixelutils.c
+++ b/libavutil/pixelutils.c
@@ -19,6 +19,7 @@
#include "config.h"
#include "common.h"
#include "pixelutils.h"
+#include "internal.h"
#if CONFIG_PIXELUTILS
@@ -151,6 +152,8 @@ int main(void)
goto end;
}
+ ff_check_pixfmt_descriptors();
+
#define RANDOM_INIT(buf, size) do { \
int k; \
for (k = 0; k < size; k++) { \
diff --git a/libavutil/utils.c b/libavutil/utils.c
index 3682168f2b..0b765ed0de 100644
--- a/libavutil/utils.c
+++ b/libavutil/utils.c
@@ -54,9 +54,6 @@ unsigned avutil_version(void)
av_log(NULL, AV_LOG_ERROR, "Libavutil has been linked to a broken llrint()\n");
}
-#if defined(ASSERT_LEVEL) && ASSERT_LEVEL > 0
- ff_check_pixfmt_descriptors();
-#endif
checks_done = 1;
return LIBAVUTIL_VERSION_INT;
}