[FFmpeg-cvslog] Revert "sinewin_tablegen: use av_assert"

Michael Niedermayer git at videolan.org
Fri Jun 8 11:54:05 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jun  8 11:44:50 2012 +0200| [d5d30d56ed7c0386c1a9fd5c3dc4b0949e025864] | committer: Michael Niedermayer

Revert "sinewin_tablegen: use av_assert"

using as_assert() in the table generator would make the generators
have to be linked to libavutil.

This reverts commit c3b6efa4cb25400d7ff8853ee6ebd95c29b744a6.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5d30d56ed7c0386c1a9fd5c3dc4b0949e025864
---

 libavcodec/sinewin_tablegen.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/sinewin_tablegen.h b/libavcodec/sinewin_tablegen.h
index a11164d..dd7d992 100644
--- a/libavcodec/sinewin_tablegen.h
+++ b/libavcodec/sinewin_tablegen.h
@@ -23,11 +23,11 @@
 #ifndef AVCODEC_SINEWIN_TABLEGEN_H
 #define AVCODEC_SINEWIN_TABLEGEN_H
 
+#include <assert.h>
 // do not use libavutil/libm.h since this is compiled both
 // for the host and the target and config.h is only valid for the target
 #include <math.h>
 #include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
 
 #if !CONFIG_HARDCODED_TABLES
 SINETABLE(  32);
@@ -57,7 +57,7 @@ av_cold void ff_sine_window_init(float *window, int n) {
 }
 
 av_cold void ff_init_ff_sine_windows(int index) {
-    av_assert0(index >= 0 && index < FF_ARRAY_ELEMS(ff_sine_windows));
+    assert(index >= 0 && index < FF_ARRAY_ELEMS(ff_sine_windows));
 #if !CONFIG_HARDCODED_TABLES
     ff_sine_window_init(ff_sine_windows[index], 1 << index);
 #endif



More information about the ffmpeg-cvslog mailing list