[FFmpeg-devel] [PATCH] do not #include assert.h directly
Mans Rullgard
mans
Tue May 13 20:47:56 CEST 2008
libavutil/internal.h includes assert.h, defining NDEBUG if DEBUG is
not defined. Including assert.h again has no effect, and is possibly
confusing.
---
libavcodec/4xm.c | 3 ---
libavcodec/acelp_math.c | 1 -
libavcodec/asv1.c | 3 ---
libavcodec/bitstream.h | 1 -
libavcodec/cabac.h | 2 --
libavcodec/dv.c | 3 ---
libavcodec/dvdsubenc.c | 3 ---
libavcodec/flac.c | 3 ---
libavcodec/h263.c | 3 ---
libavcodec/h264.c | 3 ---
libavcodec/h264_parser.c | 3 ---
libavcodec/i386/dsputil_mmx.c | 3 ---
libavcodec/libdiracdec.c | 3 ---
libavcodec/libdiracenc.c | 4 ----
libavcodec/libschroedingerdec.c | 4 ----
libavcodec/libschroedingerenc.c | 3 ---
libavcodec/libvorbis.c | 3 ---
libavcodec/libxvid_rc.c | 3 ---
libavcodec/mdec.c | 3 ---
libavcodec/mjpegdec.c | 3 ---
libavcodec/mjpegenc.c | 3 ---
libavcodec/motion_est.c | 3 ---
libavcodec/mpeg12.c | 4 ----
libavcodec/mpegvideo.c | 3 ---
libavcodec/mpegvideo_enc.c | 3 ---
libavcodec/ppc/snow_altivec.c | 5 -----
libavcodec/qdm2.c | 4 ----
libavcodec/rangecoder.h | 1 -
libavcodec/ratecontrol.c | 3 ---
libavcodec/snow.c | 3 ---
libavcodec/svq1dec.c | 3 ---
libavcodec/svq1enc.c | 4 ----
libavcodec/vc1.c | 3 ---
libavcodec/vcr1.c | 3 ---
libavcodec/vorbis_dec.c | 3 ---
libavcodec/vorbis_enc.c | 3 ---
libavcodec/wma.c | 3 ---
libavcodec/wmadec.c | 3 ---
libavcodec/wmaenc.c | 4 ----
libavcodec/xvmcvideo.c | 3 ---
libavformat/asf-enc.c | 4 ----
libavformat/asf.c | 3 ---
libavformat/avidec.c | 3 ---
libavformat/flvenc.c | 3 ---
libavformat/mov.c | 4 ----
libavformat/movenc.c | 3 ---
libavformat/mpeg.c | 3 ---
libavformat/mpegenc.c | 3 ---
libavformat/nutdec.c | 3 ---
libavformat/rtp_h264.c | 1 -
libavformat/swf.c | 3 ---
libavformat/utils.c | 3 ---
52 files changed, 0 insertions(+), 157 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 9eea643..67b7458 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -29,9 +29,6 @@
#include "bitstream.h"
#include "bytestream.h"
-//#undef NDEBUG
-//#include <assert.h>
-
#define BLOCK_TYPE_VLC_BITS 5
#define ACDC_VLC_BITS 9
diff --git a/libavcodec/acelp_math.c b/libavcodec/acelp_math.c
index 6c8a017..6d65533 100644
--- a/libavcodec/acelp_math.c
+++ b/libavcodec/acelp_math.c
@@ -22,7 +22,6 @@
#include <inttypes.h>
#include <limits.h>
-#include <assert.h>
#include "avcodec.h"
#include "acelp_math.h"
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 0e80a61..ac04206 100644
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -29,9 +29,6 @@
#include "dsputil.h"
#include "mpeg12data.h"
-//#undef NDEBUG
-//#include <assert.h>
-
#define VLC_BITS 6
#define ASV2_LEVEL_VLC_BITS 10
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 68b9cf6..7443ed8 100644
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.h
@@ -28,7 +28,6 @@
#include <stdint.h>
#include <stdlib.h>
-#include <assert.h>
#include "libavutil/bswap.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
diff --git a/libavcodec/cabac.h b/libavcodec/cabac.h
index b748237..9ef3df3 100644
--- a/libavcodec/cabac.h
+++ b/libavcodec/cabac.h
@@ -29,8 +29,6 @@
#include "bitstream.h"
-//#undef NDEBUG
-#include <assert.h>
#ifdef ARCH_X86
#include "libavutil/x86_cpu.h"
#endif
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 71602f5..a8051bd 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -40,9 +40,6 @@
#include "simple_idct.h"
#include "dvdata.h"
-//#undef NDEBUG
-//#include <assert.h>
-
typedef struct DVVideoContext {
const DVprofile* sys;
AVFrame picture;
diff --git a/libavcodec/dvdsubenc.c b/libavcodec/dvdsubenc.c
index 0859ee2..9e6b658 100644
--- a/libavcodec/dvdsubenc.c
+++ b/libavcodec/dvdsubenc.c
@@ -21,9 +21,6 @@
#include "avcodec.h"
#include "bytestream.h"
-#undef NDEBUG
-#include <assert.h>
-
// ncnt is the nibble counter
#define PUTNIBBLE(val)\
do {\
diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 0a59037..56d04b0 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -42,9 +42,6 @@
#include "golomb.h"
#include "flac.h"
-#undef NDEBUG
-#include <assert.h>
-
#define MAX_CHANNELS 8
#define MAX_BLOCKSIZE 65535
#define FLAC_STREAMINFO_SIZE 34
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index ad54203..9b63b68 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -40,9 +40,6 @@
#include "h263data.h"
#include "mpeg4data.h"
-//#undef NDEBUG
-//#include <assert.h>
-
#define INTRA_MCBPC_VLC_BITS 6
#define INTER_MCBPC_VLC_BITS 7
#define CBPY_VLC_BITS 6
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 5d8f7e0..ef9175b 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -39,9 +39,6 @@
#include "i386/h264_i386.h"
#endif
-//#undef NDEBUG
-#include <assert.h>
-
/**
* Value of Picture.reference when Picture is not a reference picture, but
* is held for delayed output.
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index 7a85d77..bd15382 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -28,9 +28,6 @@
#include "parser.h"
#include "h264_parser.h"
-#include <assert.h>
-
-
int ff_h264_find_frame_end(H264Context *h, const uint8_t *buf, int buf_size)
{
int i;
diff --git a/libavcodec/i386/dsputil_mmx.c b/libavcodec/i386/dsputil_mmx.c
index 53cfe9d..716c248 100644
--- a/libavcodec/i386/dsputil_mmx.c
+++ b/libavcodec/i386/dsputil_mmx.c
@@ -33,9 +33,6 @@
#include "vp3dsp_sse2.h"
#include "idct_xvid.h"
-//#undef NDEBUG
-//#include <assert.h>
-
int mm_flags; /* multimedia extension flags */
/* pixel operations */
diff --git a/libavcodec/libdiracdec.c b/libavcodec/libdiracdec.c
index 5054a1c..bdc5676 100644
--- a/libavcodec/libdiracdec.c
+++ b/libavcodec/libdiracdec.c
@@ -30,9 +30,6 @@
#include "libdirac.h"
-#undef NDEBUG
-#include <assert.h>
-
#include <libdirac_decoder/dirac_parser.h>
/** contains a single frame returned from Dirac */
diff --git a/libavcodec/libdiracenc.c b/libavcodec/libdiracenc.c
index e2c3188..80f338b 100644
--- a/libavcodec/libdiracenc.c
+++ b/libavcodec/libdiracenc.c
@@ -31,10 +31,6 @@
#include "libdirac_libschro.h"
#include "libdirac.h"
-#undef NDEBUG
-#include <assert.h>
-
-
#include <libdirac_encoder/dirac_encoder.h>
/** Dirac encoder private data */
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index b03df79..eacab92 100644
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
@@ -31,10 +31,6 @@
#include "libdirac_libschro.h"
#include "libschroedinger.h"
-#undef NDEBUG
-#include <assert.h>
-
-
#include <schroedinger/schro.h>
#include <schroedinger/schrodebug.h>
#include <schroedinger/schrovideoformat.h>
diff --git a/libavcodec/libschroedingerenc.c b/libavcodec/libschroedingerenc.c
index 516b881..7aa6436 100644
--- a/libavcodec/libschroedingerenc.c
+++ b/libavcodec/libschroedingerenc.c
@@ -27,9 +27,6 @@
* (http://dirac.sourceforge.net/specification.html).
*/
-#undef NDEBUG
-#include <assert.h>
-
#include <schroedinger/schro.h>
#include <schroedinger/schrodebug.h>
#include <schroedinger/schrovideoformat.h>
diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c
index 78bc6cb..e78a080 100644
--- a/libavcodec/libvorbis.c
+++ b/libavcodec/libvorbis.c
@@ -29,9 +29,6 @@
#include "avcodec.h"
#include "bytestream.h"
-#undef NDEBUG
-#include <assert.h>
-
#define OGGVORBIS_FRAME_SIZE 64
#define BUFFER_SIZE (1024*64)
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c
index 197af61..3ab576a 100644
--- a/libavcodec/libxvid_rc.c
+++ b/libavcodec/libxvid_rc.c
@@ -27,9 +27,6 @@
//#include "dsputil.h"
#include "mpegvideo.h"
-#undef NDEBUG
-#include <assert.h>
-
extern unsigned int xvid_debug;
int ff_xvid_rate_control_init(MpegEncContext *s){
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c
index 356e031..ef9b733 100644
--- a/libavcodec/mdec.c
+++ b/libavcodec/mdec.c
@@ -31,9 +31,6 @@
#include "dsputil.h"
#include "mpegvideo.h"
-//#undef NDEBUG
-//#include <assert.h>
-
typedef struct MDECContext{
AVCodecContext *avctx;
DSPContext dsp;
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index a8929fc..f18d79a 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -30,9 +30,6 @@
* MJPEG decoder.
*/
-//#define DEBUG
-#include <assert.h>
-
#include "avcodec.h"
#include "dsputil.h"
#include "mjpeg.h"
diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index d131195..903cc9b 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -30,9 +30,6 @@
* MJPEG encoder.
*/
-//#define DEBUG
-#include <assert.h>
-
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 54bc93d..f61941f 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -34,9 +34,6 @@
#include "dsputil.h"
#include "mpegvideo.h"
-#undef NDEBUG
-#include <assert.h>
-
#define SQ(a) ((a)*(a))
#define P_LEFT P[1]
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 86e1334..4964ad9 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -35,10 +35,6 @@
#include "mpeg12decdata.h"
#include "bytestream.h"
-//#undef NDEBUG
-//#include <assert.h>
-
-
#define DC_VLC_BITS 9
#define MV_VLC_BITS 9
#define MBINCR_VLC_BITS 9
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4faf85f..8200845 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -36,9 +36,6 @@
#include "faandct.h"
#include <limits.h>
-//#undef NDEBUG
-//#include <assert.h>
-
static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
DCTELEM *block, int n, int qscale);
static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 12f87c4..f639d7b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -37,9 +37,6 @@
#include "faandct.h"
#include <limits.h>
-//#undef NDEBUG
-//#include <assert.h>
-
static int encode_picture(MpegEncContext *s, int picture_number);
static int dct_quantize_refine(MpegEncContext *s, DCTELEM *block, int16_t *weight, DCTELEM *orig, int n, int qscale);
static int sse_mb(MpegEncContext *s);
diff --git a/libavcodec/ppc/snow_altivec.c b/libavcodec/ppc/snow_altivec.c
index ea228b0..4a28d55 100644
--- a/libavcodec/ppc/snow_altivec.c
+++ b/libavcodec/ppc/snow_altivec.c
@@ -25,11 +25,6 @@
#include "gcc_fixes.h"
#include "dsputil_altivec.h"
-#undef NDEBUG
-#include <assert.h>
-
-
-
//FIXME remove this replication
#define slice_buffer_get_line(slice_buf, line_num) ((slice_buf)->line[line_num] ? (slice_buf)->line[line_num] : slice_buffer_load_line((slice_buf), (line_num)))
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 399585f..f60754e 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -47,10 +47,6 @@
#include "qdm2data.h"
-#undef NDEBUG
-#include <assert.h>
-
-
#define SOFTCLIP_THRESHOLD 27600
#define HARDCLIP_THRESHOLD 35716
diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 7d23b25..132aff0 100644
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -28,7 +28,6 @@
#define FFMPEG_RANGECODER_H
#include <stdint.h>
-#include <assert.h>
#include "libavutil/common.h"
typedef struct RangeCoder{
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c
index 27bf938..108edde 100644
--- a/libavcodec/ratecontrol.c
+++ b/libavcodec/ratecontrol.c
@@ -31,9 +31,6 @@
#include "mpegvideo.h"
#include "eval.h"
-#undef NDEBUG // Always check asserts, the speed effect is far too small to disable them.
-#include <assert.h>
-
#ifndef M_E
#define M_E 2.718281828
#endif
diff --git a/libavcodec/snow.c b/libavcodec/snow.c
index 4d1bb70..655a809 100644
--- a/libavcodec/snow.c
+++ b/libavcodec/snow.c
@@ -26,9 +26,6 @@
#include "mpegvideo.h"
-#undef NDEBUG
-#include <assert.h>
-
static const int8_t quant3[256]={
0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index fd96074..9a355dc 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -40,9 +40,6 @@
#include "svq1.h"
-#undef NDEBUG
-#include <assert.h>
-
extern const uint8_t mvtab[33][2];
static VLC svq1_block_type;
diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c
index a9713ea..5737706 100644
--- a/libavcodec/svq1enc.c
+++ b/libavcodec/svq1enc.c
@@ -34,10 +34,6 @@
#include "svq1.h"
#include "svq1enc_cb.h"
-#undef NDEBUG
-#include <assert.h>
-
-
typedef struct SVQ1Context {
MpegEncContext m; // needed for motion estimation, should not be used for anything else, the idea is to make the motion estimation eventually independent of MpegEncContext, so this will be removed then (FIXME/XXX)
AVCodecContext *avctx;
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index c4cac00..b804b9c 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -35,9 +35,6 @@
#include "unary.h"
#include "simple_idct.h"
-#undef NDEBUG
-#include <assert.h>
-
#define MB_INTRA_VLC_BITS 9
#define DC_VLC_BITS 9
#define AC_VLC_BITS 9
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index f316c8f..cd662ad 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -27,9 +27,6 @@
#include "avcodec.h"
#include "dsputil.h"
-//#undef NDEBUG
-//#include <assert.h>
-
typedef struct VCR1Context{
AVCodecContext *avctx;
AVFrame picture;
diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index 5cce320..b5306f9 100644
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -42,9 +42,6 @@
#define AV_DEBUG(...)
#endif
-#undef NDEBUG
-#include <assert.h>
-
typedef struct {
uint_fast8_t dimensions;
uint_fast8_t lookup_type;
diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index 2df9464..7f31bae 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -30,9 +30,6 @@
#include "vorbis.h"
#include "vorbis_enc_data.h"
-#undef NDEBUG
-#include <assert.h>
-
typedef struct {
int nentries;
uint8_t * lens;
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index e257aed..29f7ae2 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -23,9 +23,6 @@
#include "wma.h"
#include "wmadata.h"
-#undef NDEBUG
-#include <assert.h>
-
/* XXX: use same run/length optimization as mpeg decoders */
//FIXME maybe split decode / encode or pass flag
static void init_coef_vlc(VLC *vlc,
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index e622b23..f8d0cd3 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -36,9 +36,6 @@
#include "avcodec.h"
#include "wma.h"
-#undef NDEBUG
-#include <assert.h>
-
#define EXPVLCBITS 8
#define EXPMAX ((19+EXPVLCBITS-1)/EXPVLCBITS)
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index d050900..6c8229f 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -22,10 +22,6 @@
#include "avcodec.h"
#include "wma.h"
-#undef NDEBUG
-#include <assert.h>
-
-
static int encode_init(AVCodecContext * avctx){
WMACodecContext *s = avctx->priv_data;
int i, flags1, flags2;
diff --git a/libavcodec/xvmcvideo.c b/libavcodec/xvmcvideo.c
index 93d93a6..4e889ea 100644
--- a/libavcodec/xvmcvideo.c
+++ b/libavcodec/xvmcvideo.c
@@ -26,9 +26,6 @@
#include "dsputil.h"
#include "mpegvideo.h"
-#undef NDEBUG
-#include <assert.h>
-
//X11 includes are in xvmc_render.h
//by replacing it with non-X one
//XvMC emulation could be performed
diff --git a/libavformat/asf-enc.c b/libavformat/asf-enc.c
index 6bd89f4..4e1d813 100644
--- a/libavformat/asf-enc.c
+++ b/libavformat/asf-enc.c
@@ -22,10 +22,6 @@
#include "riff.h"
#include "asf.h"
-#undef NDEBUG
-#include <assert.h>
-
-
#define ASF_INDEXED_INTERVAL 10000000
#define ASF_INDEX_BLOCK 600
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 20fe917..a806652 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -28,9 +28,6 @@
extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
-#undef NDEBUG
-#include <assert.h>
-
#define FRAME_HEADER_SIZE 17
// Fix Me! FRAME_HEADER_SIZE may be different.
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index ef54464..6fc39b3 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -23,9 +23,6 @@
#include "dv.h"
#include "riff.h"
-#undef NDEBUG
-#include <assert.h>
-
//#define DEBUG
//#define DEBUG_SEEK
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 718e784..109374d 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -22,9 +22,6 @@
#include "flv.h"
#include "riff.h"
-#undef NDEBUG
-#include <assert.h>
-
static const AVCodecTag flv_video_codec_ids[] = {
{CODEC_ID_FLV1, FLV_CODECID_H263 },
{CODEC_ID_FLASHSV, FLV_CODECID_SCREEN},
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 75d4216..c336e0a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -56,10 +56,6 @@
#include "qtpalette.h"
-
-#undef NDEBUG
-#include <assert.h>
-
/* the QuickTime file format is quite convoluted...
* it has lots of index tables, each indexing something in another one...
* Here we just use what is needed to read the chunks
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5ded250..68ded07 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -25,9 +25,6 @@
#include "isom.h"
#include "avc.h"
-#undef NDEBUG
-#include <assert.h>
-
#define MOV_INDEX_CLUSTER_SIZE 16384
#define globalTimescale 1000
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index 480c054..22b23ef 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -24,9 +24,6 @@
//#define DEBUG_SEEK
-#undef NDEBUG
-#include <assert.h>
-
/*********************************************/
/* demux code */
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 05c72cd..b727770 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -27,9 +27,6 @@
#define MAX_PAYLOAD_SIZE 4096
//#define DEBUG_SEEK
-#undef NDEBUG
-#include <assert.h>
-
typedef struct PacketDesc {
int64_t pts;
int64_t dts;
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 772a527..9913ce7 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -24,9 +24,6 @@
#include "libavutil/tree.h"
#include "nut.h"
-#undef NDEBUG
-#include <assert.h>
-
static int get_str(ByteIOContext *bc, char *string, unsigned int maxlen){
unsigned int len= ff_get_v(bc);
diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c
index 009774e..35487fa 100644
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtp_h264.c
@@ -44,7 +44,6 @@
#include <unistd.h>
#include "network.h"
-#include <assert.h>
#include "rtp_internal.h"
#include "rtp_h264.h"
diff --git a/libavformat/swf.c b/libavformat/swf.c
index 9d7d0f2..64cad80 100644
--- a/libavformat/swf.c
+++ b/libavformat/swf.c
@@ -57,9 +57,6 @@
#define VIDEO_ID 0
#define SHAPE_ID 1
-#undef NDEBUG
-#include <assert.h>
-
typedef struct {
int audio_stream_index;
offset_t duration_pos;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5b6fd55..240658e 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -25,9 +25,6 @@
#include <sys/time.h>
#include <time.h>
-#undef NDEBUG
-#include <assert.h>
-
/**
* @file libavformat/utils.c
* various utility functions for use within FFmpeg
--
1.5.5.1
More information about the ffmpeg-devel
mailing list