---
Should make easier to use assert() in less surprising ways.
configure | 5 ++++-
libavutil/internal.h | 4 ----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index edf89b8..eff2a1f 100755
--- a/configure
+++ b/configure
@@ -1732,6 +1732,7 @@ CMDLINE_SELECT="
$HAVE_LIST_CMDLINE
$THREADS_LIST
asm
+ assert
cross_compile
debug
extra_warnings
@@ -4744,7 +4745,9 @@ enabled vdpau && enabled xlib &&
prepend avconv_libs $($ldflags_filter "-lvdpau") &&
enable vdpau_x11
-enabled debug && add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel"
+enabled debug && {
+ add_cflags -g"$debuglevel" && add_asflags -g"$debuglevel";
+} || enabled assert || add_cppflags -DNDEBUG
# add some useful compiler flags if supported
check_cflags -Wdeclaration-after-statement
diff --git a/libavutil/internal.h b/libavutil/internal.h
index b9be333..299fb0b 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -26,10 +26,6 @@
#ifndef AVUTIL_INTERNAL_H
#define AVUTIL_INTERNAL_H
-#if !defined(DEBUG) && !defined(NDEBUG)
-# define NDEBUG
-#endif
-
#include <limits.h>
#include <stdint.h>
#include <stddef.h>
--
2.6.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
