From 0f40c9098498ad90dbbd2380eb4269015e84bde4 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 14 Apr 2016 18:24:51 +0200 Subject: Drop pointless assert.h #includes --- 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 --- 12 files changed, 3 insertions(+), 30 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/ac3dsp.c b/libavcodec/ac3dsp.c index 933550bfdc..38c35b187a 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 3a6c7fac16..21d35835a5 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 50dea33ef1..d73b76a535 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -25,7 +25,6 @@ * @author Michael Niedermayer */ -#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 2d31b03967..c2f748b944 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -22,8 +22,8 @@ #include #include -#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 cb7374c552..fb0781ed5c 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -37,10 +37,6 @@ #include "internal.h" #include "libschroedinger.h" -#undef NDEBUG -#include - - #include #include #include diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index e48c945072..8291113cb1 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -30,8 +30,6 @@ * MJPEG encoder. */ -#include - #include "libavutil/pixdesc.h" #include "avcodec.h" diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index 78dff5a1e0..bbd57124fa 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -47,9 +47,6 @@ #include "qdm2data.h" #include "qdm2_tablegen.h" -#undef NDEBUG -#include - #define QDM2_LIST_ADD(list, size, packet) \ do { \ diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index 4f84395891..841f945384 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -40,9 +40,6 @@ #include "mathops.h" #include "svq1.h" -#undef NDEBUG -#include - 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 14634bd993..9292b32903 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -36,9 +36,6 @@ #include "unary.h" #include "simple_idct.h" -#undef NDEBUG -#include - /***********************************************************************/ /** * @name VC-1 Bitplane decoding diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index bf5f8d9c31..b7784393df 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -22,15 +22,11 @@ */ #include -#include "libavutil/avassert.h" + #include "avcodec.h" #include "internal.h" #include "h264.h" #include "vc1.h" - -#undef NDEBUG -#include - #include "vdpau.h" #include "vdpau_internal.h" diff --git a/libavcodec/wma.c b/libavcodec/wma.c index f0aabfcba3..9f4e757f14 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -29,9 +29,6 @@ #include "wma_freqs.h" #include "wmadata.h" -#undef NDEBUG -#include - /* 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 b79dd2a101..b6be51ad4b 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -39,9 +39,6 @@ #include "internal.h" #include "wma.h" -#undef NDEBUG -#include - #define EXPVLCBITS 8 #define EXPMAX ((19 + EXPVLCBITS - 1) / EXPVLCBITS) -- cgit v1.2.3