From 4fa58b74745ead74fd3aeb83deb1ff534cc21539 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Wed, 10 Dec 2003 16:30:26 +0000
Subject: fix warnings about NDEBUG being redefined

CVS patchset: 5886
CVS date: 2003/12/10 16:30:26
---
 src/libffmpeg/diff_to_ffmpeg_cvs.txt | 12 +++++++++++-
 src/libffmpeg/libavcodec/common.h    |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/libffmpeg/diff_to_ffmpeg_cvs.txt b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
index dc4d9924e..f62080f04 100644
--- a/src/libffmpeg/diff_to_ffmpeg_cvs.txt
+++ b/src/libffmpeg/diff_to_ffmpeg_cvs.txt
@@ -48,7 +48,17 @@
  {
 --- libavcodec/common.h	2003-11-01 18:43:19.000000000 +0100
 +++ libavcodec/common.h	2003-10-27 19:42:02.000000000 +0100
-@@ -184,11 +184,19 @@
+@@ -173,7 +173,9 @@
+ /* debug stuff */
+ 
+ #    ifndef DEBUG
++#      ifndef NDEBUG
+ #        define NDEBUG
++#      endif
+ #    endif
+ #    include <assert.h>
+ 
+@@ -184,11 +186,19 @@
  
  #    else
  
diff --git a/src/libffmpeg/libavcodec/common.h b/src/libffmpeg/libavcodec/common.h
index 96dc443bd..870a3279c 100644
--- a/src/libffmpeg/libavcodec/common.h
+++ b/src/libffmpeg/libavcodec/common.h
@@ -173,7 +173,9 @@ typedef signed __int64 int64_t;
 /* debug stuff */
 
 #    ifndef DEBUG
+#      ifndef NDEBUG
 #        define NDEBUG
+#      endif
 #    endif
 #    include <assert.h>
 
-- 
cgit v1.2.3