[FFmpeg-cvslog] Drop pointless assert.h #includes
Diego Biurrun
git at videolan.org
Tue Jun 21 15:26:18 CEST 2016
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Apr 14 18:24:51 2016 +0200| [0f40c9098498ad90dbbd2380eb4269015e84bde4] | committer: Diego Biurrun
Drop pointless assert.h #includes
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f40c9098498ad90dbbd2380eb4269015e84bde4
---
avconv_vdpau.c | 1 -
libavcodec/ac3dsp.c | 1 -
libavcodec/ffv1.c | 2 +-
libavcodec/h264.c | 1 -
libavcodec/libopusdec.c | 2 +-
libavcodec/libschroedingerdec.c | 4 ----
libavcodec/mjpegenc.c | 2 --
libavcodec/qdm2.c | 3 ---
libavcodec/svq1dec.c | 3 ---
libavcodec/vc1.c | 3 ---
libavcodec/vdpau.c | 6 +-----
libavcodec/wma.c | 3 ---
libavcodec/wmadec.c | 3 ---
libavfilter/vf_hwdownload.c | 1 -
libavfilter/vf_pad.c | 1 -
libavformat/asfdec.c | 1 -
libavformat/mov.c | 3 ---
libavformat/movenc.c | 3 ---
libavformat/mpeg.c | 3 ---
libavformat/mux.c | 1 -
libavformat/swf.h | 3 ---
libswscale/output.c | 1 -
libswscale/ppc/yuv2rgb_altivec.c | 1 -
libswscale/x86/yuv2rgb.c | 1 -
tests/tiny_psnr.c | 1 -
25 files changed, 3 insertions(+), 51 deletions(-)
diff --git a/avconv_vdpau.c b/avconv_vdpau.c
index 0ccf29e..b58949e 100644
--- a/avconv_vdpau.c
+++ b/avconv_vdpau.c
@@ -27,7 +27,6 @@
#include "libavcodec/vdpau.h"
-#include "libavutil/avassert.h"
#include "libavutil/buffer.h"
#include "libavutil/frame.h"
#include "libavutil/hwcontext.h"
diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c
index 933550b..38c35b1 100644
--- a/libavcodec/ac3dsp.c
+++ b/libavcodec/ac3dsp.c
@@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/avassert.h"
#include "avcodec.h"
#include "ac3.h"
#include "ac3dsp.h"
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 3a6c7fa..21d3583 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -26,7 +26,7 @@
*/
#include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
+
#include "avcodec.h"
#include "get_bits.h"
#include "put_bits.h"
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 50dea33..d73b76a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -25,7 +25,6 @@
* @author Michael Niedermayer <michaelni at gmx.at>
*/
-#include "libavutil/avassert.h"
#include "libavutil/display.h"
#include "libavutil/imgutils.h"
#include "libavutil/opt.h"
diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 2d31b03..c2f748b 100644
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -22,8 +22,8 @@
#include <opus.h>
#include <opus_multistream.h>
-#include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
+
#include "avcodec.h"
#include "internal.h"
#include "vorbis.h"
diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c
index cb7374c..fb0781e 100644
--- a/libavcodec/libschroedingerdec.c
+++ b/libavcodec/libschroedingerdec.c
@@ -37,10 +37,6 @@
#include "internal.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/mjpegenc.c b/libavcodec/mjpegenc.c
index e48c945..8291113 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -30,8 +30,6 @@
* MJPEG encoder.
*/
-#include <assert.h>
-
#include "libavutil/pixdesc.h"
#include "avcodec.h"
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 78dff5a..bbd5712 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -47,9 +47,6 @@
#include "qdm2data.h"
#include "qdm2_tablegen.h"
-#undef NDEBUG
-#include <assert.h>
-
#define QDM2_LIST_ADD(list, size, packet) \
do { \
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c
index 4f84395..841f945 100644
--- a/libavcodec/svq1dec.c
+++ b/libavcodec/svq1dec.c
@@ -40,9 +40,6 @@
#include "mathops.h"
#include "svq1.h"
-#undef NDEBUG
-#include <assert.h>
-
static VLC svq1_block_type;
static VLC svq1_motion_component;
static VLC svq1_intra_multistage[6];
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 14634bd..9292b32 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -36,9 +36,6 @@
#include "unary.h"
#include "simple_idct.h"
-#undef NDEBUG
-#include <assert.h>
-
/***********************************************************************/
/**
* @name VC-1 Bitplane decoding
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index bf5f8d9..b778439 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -22,15 +22,11 @@
*/
#include <limits.h>
-#include "libavutil/avassert.h"
+
#include "avcodec.h"
#include "internal.h"
#include "h264.h"
#include "vc1.h"
-
-#undef NDEBUG
-#include <assert.h>
-
#include "vdpau.h"
#include "vdpau_internal.h"
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index f0aabfc..9f4e757 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -29,9 +29,6 @@
#include "wma_freqs.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 av_cold int init_coef_vlc(VLC *vlc, uint16_t **prun_table,
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c
index b79dd2a..b6be51ad 100644
--- a/libavcodec/wmadec.c
+++ b/libavcodec/wmadec.c
@@ -39,9 +39,6 @@
#include "internal.h"
#include "wma.h"
-#undef NDEBUG
-#include <assert.h>
-
#define EXPVLCBITS 8
#define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS)
diff --git a/libavfilter/vf_hwdownload.c b/libavfilter/vf_hwdownload.c
index 0ba1d98..4ba465b 100644
--- a/libavfilter/vf_hwdownload.c
+++ b/libavfilter/vf_hwdownload.c
@@ -16,7 +16,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/avassert.h"
#include "libavutil/buffer.h"
#include "libavutil/hwcontext.h"
#include "libavutil/log.h"
diff --git a/libavfilter/vf_pad.c b/libavfilter/vf_pad.c
index cddd2a6..d901547 100644
--- a/libavfilter/vf_pad.c
+++ b/libavfilter/vf_pad.c
@@ -33,7 +33,6 @@
#include "libavutil/eval.h"
#include "libavutil/pixdesc.h"
#include "libavutil/colorspace.h"
-#include "libavutil/avassert.h"
#include "libavutil/imgutils.h"
#include "libavutil/parseutils.h"
#include "libavutil/mathematics.h"
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index e3320e9..f232374 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -20,7 +20,6 @@
*/
#include "libavutil/attributes.h"
-#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/bswap.h"
#include "libavutil/common.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 9d271f8..ac6ff5d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -54,9 +54,6 @@
#include "qtpalette.h"
-#undef NDEBUG
-#include <assert.h>
-
/* those functions parse an atom */
/* links atom IDs to parse functions */
typedef struct MOVParseTableEntry {
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b792a3b..84a57c1 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -44,9 +44,6 @@
#include "rtpenc.h"
#include "mov_chan.h"
-#undef NDEBUG
-#include <assert.h>
-
static const AVOption options[] = {
{ "movflags", "MOV muxer flags", offsetof(MOVMuxContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
{ "rtphint", "Add RTP hint tracks", 0, AV_OPT_TYPE_CONST, {.i64 = FF_MOV_FLAG_RTP_HINT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "movflags" },
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index f405c4e..39374b6 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -23,9 +23,6 @@
#include "internal.h"
#include "mpeg.h"
-#undef NDEBUG
-#include <assert.h>
-
/*********************************************/
/* demux code */
diff --git a/libavformat/mux.c b/libavformat/mux.c
index 76662ee..c967ad6 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -29,7 +29,6 @@
#include "libavutil/pixdesc.h"
#include "metadata.h"
#include "id3v2.h"
-#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/internal.h"
#include "libavutil/mathematics.h"
diff --git a/libavformat/swf.h b/libavformat/swf.h
index 93473e7..9b90251 100644
--- a/libavformat/swf.h
+++ b/libavformat/swf.h
@@ -67,9 +67,6 @@
#define VIDEO_ID 0
#define SHAPE_ID 1
-#undef NDEBUG
-#include <assert.h>
-
typedef struct SWFContext {
int64_t duration_pos;
int64_t tag_pos;
diff --git a/libswscale/output.c b/libswscale/output.c
index 1466f0a..c06411e 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -18,7 +18,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <assert.h>
#include <math.h>
#include <stdint.h>
#include <stdio.h>
diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c
index a2ace78..622469a 100644
--- a/libswscale/ppc/yuv2rgb_altivec.c
+++ b/libswscale/ppc/yuv2rgb_altivec.c
@@ -89,7 +89,6 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
-#include <assert.h>
#include "config.h"
#include "libswscale/rgb2rgb.h"
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c
index bacc87f..68d3bc2 100644
--- a/libswscale/x86/yuv2rgb.c
+++ b/libswscale/x86/yuv2rgb.c
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <inttypes.h>
-#include <assert.h>
#include "config.h"
#include "libswscale/rgb2rgb.h"
diff --git a/tests/tiny_psnr.c b/tests/tiny_psnr.c
index 3fe1087..1afdd4d 100644
--- a/tests/tiny_psnr.c
+++ b/tests/tiny_psnr.c
@@ -22,7 +22,6 @@
#include <stdlib.h>
#include <string.h>
#include <inttypes.h>
-#include <assert.h>
#include <math.h>
#include <float.h>
More information about the ffmpeg-cvslog
mailing list