diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index e34fa1ddc6c41cf2c52b0d2d5912b117b834256f..fd031348c4eedb449484afceef88903360176802 100644
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -32,9 +32,6 @@
 #include "get_bits.h"
 #include "internal.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 #define BLOCK_TYPE_VLC_BITS 5
 #define ACDC_VLC_BITS 9
 
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index d372028bfee56da1c09555ad3ba5adda0e04501b..ce6c1a68e0845f22594f5b491c256a063670ab75 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -26,8 +26,6 @@
  * The simplest AC-3 encoder.
  */
 
-//#define ASSERT_LEVEL 2
-
 #include <stdint.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/alsdec.c b/libavcodec/alsdec.c
index 3d419bba10dc026277a5a26f74532444e4eb098b..8451edb081ffea99925cb62c49f50423b53cbc90 100644
--- a/libavcodec/alsdec.c
+++ b/libavcodec/alsdec.c
@@ -25,10 +25,6 @@
  * @author Thilo Borgmann <thilo.borgmann _at_ googlemail.com>
  */
 
-
-//#define DEBUG
-
-
 #include "avcodec.h"
 #include "get_bits.h"
 #include "unary.h"
diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index a1246877a76e82874279c414694d53307f9cee75..9f74abbbec9f531731db01073a28e2a47238b3d7 100644
--- a/libavcodec/asvdec.c
+++ b/libavcodec/asvdec.c
@@ -33,9 +33,6 @@
 #include "mathops.h"
 #include "mpeg12data.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 #define VLC_BITS 6
 #define ASV2_LEVEL_VLC_BITS 10
 
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index ab6636cbc038cb3e99a5ac82493a6d85e72ffb6a..0a8bc5942366199e93018e7e5269299e820d00fb 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -22,9 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define TRACE
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index 920fa456e919c12b62a8e0f838144418a449e895..c834ec35158dc18e6bedc784d6ce4b9d10af865d 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -23,7 +23,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
 #define RC_VARIANCE 1 // use variance or ssd for fast rc
 
 #include "libavutil/attributes.h"
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 029591b171f1cb37cf1d9d66f218cc0bd64f9464..3add4e863a61e613d09ada00c2352a57dcb1498b 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -34,9 +34,6 @@
 #include "avcodec.h"
 #include "rnd_avg.h"
 
-
-//#define DEBUG
-
 /* encoding scans */
 extern const uint8_t ff_alternate_horizontal_scan[64];
 extern const uint8_t ff_alternate_vertical_scan[64];
diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index 970da8689516ce8997d4ab62768ca5d665984cd6..eadde3234f69e88b6cda88424b34f0793f506939 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -26,8 +26,6 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/avstring.h"
 
-//#define DEBUG
-
 typedef struct DVDSubContext {
     uint32_t palette[16];
     int      has_palette;
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c
index 9b74d342c8ea210f86ee0aef329e195801b8090b..d8a3b742a7b6c96d571b15e56f619cfb4d5b0a31 100644
--- a/libavcodec/gifdec.c
+++ b/libavcodec/gifdec.c
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index c097033951fb5fc5d2d8f949caee6e42788f6bc8..0a7ec87ba12ab22f5555f2cd720e1f95c1920b97 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -27,7 +27,6 @@
  * h263/mpeg4 codec.
  */
 
-//#define DEBUG
 #include <limits.h>
 
 #include "avcodec.h"
@@ -39,8 +38,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#undef NDEBUG
-//#include <assert.h>
 
 uint8_t ff_h263_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 014033fe1d0c079e3118bb0716043597b2763e05..313012a7a3715e165ad8d35e6d9014b74a5691cd 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -39,8 +39,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#define DEBUG
-
 av_cold int ff_h263_decode_init(AVCodecContext *avctx)
 {
     MpegEncContext *s = avctx->priv_data;
diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c
index b528f2fd37d5b03777a3956bf9a986c892f467c4..25dd4d90fb1537860eae7f4a1ff5417ba65f10ab 100644
--- a/libavcodec/ituh263dec.c
+++ b/libavcodec/ituh263dec.c
@@ -27,7 +27,6 @@
  * h263 decoder.
  */
 
-//#define DEBUG
 #include <limits.h>
 
 #include "libavutil/attributes.h"
@@ -41,9 +40,6 @@
 #include "flv.h"
 #include "mpeg4video.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 // The defines below define the number of bits that are read at once for
 // reading vlc values. Changing these may improve speed and data cache needs
 // be aware though that decreasing them may need the number of stages that is
diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c
index 54629a28072dbf7f76e2f1bb8f98a6329061f181..0f59944062aadb3879d1c4d372b804899bb0a0e6 100644
--- a/libavcodec/ituh263enc.c
+++ b/libavcodec/ituh263enc.c
@@ -27,7 +27,6 @@
  * h263 bitstream encoder.
  */
 
-//#define DEBUG
 #include <limits.h>
 
 #include "libavutil/attributes.h"
@@ -40,9 +39,6 @@
 #include "mpeg4video.h"
 #include "internal.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 /**
  * Table of number of bits a motion vector component needs.
  */
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 8bc56973ed9bc70ccc30e42c4f8607d418afac48..528e676059cdfc6133a871abdcef835d6df6b4b4 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -25,7 +25,6 @@
  * MPEG-1/2 decoder
  */
 
-//#define DEBUG
 #include "libavutil/attributes.h"
 #include "internal.h"
 #include "avcodec.h"
@@ -40,9 +39,6 @@
 #include "xvmc_internal.h"
 #include "thread.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 uint8_t ff_mpeg12_static_rl_table_store[2][2][2*MAX_RUN + MAX_LEVEL + 3];
 
 #define INIT_2D_VLC_RL(rl, static_size)\
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 16c85231122b3b829110f832ea6554213bcd4359..67518640b0f82f5c3df9c84b4dc767b2cb6fbe9e 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -25,7 +25,6 @@
  * MPEG-1/2 decoder
  */
 
-//#define DEBUG
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
 #include "internal.h"
@@ -41,9 +40,6 @@
 #include "xvmc_internal.h"
 #include "thread.h"
 
-//#undef NDEBUG
-//#include <assert.h>
-
 typedef struct Mpeg1Context {
     MpegEncContext mpeg_enc_ctx;
     int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
diff --git a/libavcodec/mpegaudiodecheader.c b/libavcodec/mpegaudiodecheader.c
index f8fc833124c4e2bd0fc3e546bfebc0464c17447f..69dda452c3f2a51263e86ba378b093acf6c12070 100644
--- a/libavcodec/mpegaudiodecheader.c
+++ b/libavcodec/mpegaudiodecheader.c
@@ -24,7 +24,6 @@
  * MPEG Audio header decoder.
  */
 
-//#define DEBUG
 #include "avcodec.h"
 #include "mpegaudio.h"
 #include "mpegaudiodata.h"
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a52d04af83ee2c6a623d135ca7eb281ddcd19fa8..d958b962a14bab640125cdfbb7f9fde009584041 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -41,9 +41,6 @@
 #include "thread.h"
 #include <limits.h>
 
-//#undef NDEBUG
-//#include <assert.h>
-
 static void dct_unquantize_mpeg1_intra_c(MpegEncContext *s,
                                    int16_t *block, int n, int qscale);
 static void dct_unquantize_mpeg1_inter_c(MpegEncContext *s,
@@ -59,9 +56,6 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s,
 static void dct_unquantize_h263_inter_c(MpegEncContext *s,
                                   int16_t *block, int n, int qscale);
 
-//#define DEBUG
-
-
 static const uint8_t ff_default_chroma_qscale_table[32] = {
 //   0   1   2   3   4   5   6   7   8   9  10  11  12  13  14  15
      0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index 24b775e5b645d7b1561acfee30d62b251da1aefc..98292fa40481830868d403d2e5545062a12d24be 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -51,17 +51,12 @@
 #include "bytestream.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, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale);
 static int sse_mb(MpegEncContext *s);
 static void denoise_dct_c(MpegEncContext *s, int16_t *block);
 static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow);
 
-//#define DEBUG
-
 static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_MV * 2 + 1];
 static uint8_t default_fcode_tab[MAX_MV * 2 + 1];
 
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 3985f19ff2f724c341b9582723806fcc2dcf384a..f844850c4010c70715ce6176c7ce30b523ac34ed 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -44,7 +44,6 @@
  *        - (encoding) select best mv table (two choices)
  *        - (encoding) select best vlc/dc table
  */
-//#define DEBUG
 
 /* This table is practically identical to the one from h263
  * except that it is inverted. */
diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c
index 5b82298d227982f987aed380ccb82d0f6c96ca84..ec44d56de823e7695cd9352a21e0619a1c2dc4b0 100644
--- a/libavcodec/pngdec.c
+++ b/libavcodec/pngdec.c
@@ -31,8 +31,6 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 typedef struct PNGDecContext {
     PNGDSPContext dsp;
 
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c
index b20a6d6d467864c037d1e1ee158c9ccef8a6fb3e..7f601ca5512981ed96a7e7cb679f091069a1bdb7 100644
--- a/libavcodec/pngenc.c
+++ b/libavcodec/pngenc.c
@@ -29,8 +29,6 @@
 
 #include <zlib.h>
 
-//#define DEBUG
-
 #define IOBUF_SIZE 4096
 
 typedef struct PNGEncContext {
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index e4003a3ffbd6ef34c02492702c195555f3ee6b81..0d3b64865b301263c3796213534b8bd44aef81a8 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -32,8 +32,6 @@
 #include "mpeg4video.h"
 #include "h263.h"
 
-//#define DEBUG
-
 #define RV_GET_MAJOR_VER(x)  ((x) >> 28)
 #define RV_GET_MINOR_VER(x) (((x) >> 20) & 0xFF)
 #define RV_GET_MICRO_VER(x) (((x) >> 12) & 0xFF)
diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c
index aedf417da4a6bc239570686063ed3075624e2252..af378551a16a4684b063d9bb5a9f9fdf1baa79e1 100644
--- a/libavcodec/rv34.c
+++ b/libavcodec/rv34.c
@@ -39,8 +39,6 @@
 #include "rv34data.h"
 #include "rv34.h"
 
-//#define DEBUG
-
 static inline void ZERO8x2(void* dst, int stride)
 {
     fill_rectangle(dst,                 1, 2, stride, 0, 4);
diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index b496452bb47ae1bf2f7aa29b3bc1a80628e0e356..e9c4285dd6e26cbc32f419524e3c5d11342f357c 100644
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -28,7 +28,6 @@
  */
 
 #define BITSTREAM_READER_LE
-//#define DEBUG
 #include <limits.h>
 #include "avcodec.h"
 #include "get_bits.h"
diff --git a/libavdevice/fbdev.c b/libavdevice/fbdev.c
index 7680b29fb35689c1e46bacb23fb70892b06bc431..b820a4a16d228bae089c5886bf20b3f53816369a 100644
--- a/libavdevice/fbdev.c
+++ b/libavdevice/fbdev.c
@@ -27,8 +27,6 @@
  * @see http://linux-fbdev.sourceforge.net/
  */
 
-/* #define DEBUG */
-
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index e2062a1643edb9a892a389a1485b5332cff72379..b9939a00b87fcba8995eeaa61e563cd2024ed43f 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* #define DEBUG */
-
 #include "libavutil/avstring.h"
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
diff --git a/libavfilter/setpts.c b/libavfilter/setpts.c
index 7a1f4f31d8c8e575b677d1d290a62adb3494ebda..9fa1df5a896e98e6be6841039962f7fd35854495 100644
--- a/libavfilter/setpts.c
+++ b/libavfilter/setpts.c
@@ -24,8 +24,6 @@
  * video presentation timestamp (PTS) modification filter
  */
 
-/* #define DEBUG */
-
 #include "libavutil/eval.h"
 #include "libavutil/internal.h"
 #include "libavutil/mathematics.h"
diff --git a/libavfilter/vf_crop.c b/libavfilter/vf_crop.c
index 4dd93c8d22e181b24f6a8db57c04422c96133b99..c10c431daa4ee1e44afebda5a9796632700fb0c1 100644
--- a/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@ -23,8 +23,6 @@
  * video crop filter
  */
 
-/* #define DEBUG */
-
 #include <stdio.h>
 
 #include "avfilter.h"
diff --git a/libavfilter/vf_fieldorder.c b/libavfilter/vf_fieldorder.c
index c002b656d44827a6029ceea22a6434d69e70d079..a5b85e22b88dae06bc3f76a3e5b58ef7a661791d 100644
--- a/libavfilter/vf_fieldorder.c
+++ b/libavfilter/vf_fieldorder.c
@@ -23,8 +23,6 @@
  * video field order filter, heavily influenced by vf_pad.c
  */
 
-/* #define DEBUG */
-
 #include <stdio.h>
 #include <string.h>
 
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index 452fec0d845b3dada11dc63b5d54641d16f32cc1..c4091781d1f02c448336663b08c955fb4f0a45d0 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -22,8 +22,6 @@
  * frei0r wrapper
  */
 
-/* #define DEBUG */
-
 #include <dlfcn.h>
 #include <frei0r.h>
 #include <stdio.h>
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index 44f0037764cc8cb2e03725c3960b3d3bb4a7d40d..fff9a44429b364596bcbe3efcc3d5443e79f217a 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -23,8 +23,6 @@
  * libopencv wrapper functions
  */
 
-/* #define DEBUG */
-
 #include <opencv/cv.h>
 #include <opencv/cxcore.h>
 #include "libavutil/avstring.h"
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c
index 720f077fdd56f5d5b6b69ba6d05b7471cab4ca88..9cde9d4dd17d1d10c1fa57dbe1a2e79d05bb8d6c 100644
--- a/libavfilter/vsrc_movie.c
+++ b/libavfilter/vsrc_movie.c
@@ -28,8 +28,6 @@
  * @todo support more than one output stream
  */
 
-/* #define DEBUG */
-
 #include <float.h>
 
 #include "libavutil/attributes.h"
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index e30d47c23f8cd8b787a2af3c363e8782be0ed281..a7fdc9e4d2938d35ed26f50a9f1e523e4e560349 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "libavutil/attributes.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
diff --git a/libavformat/isom.c b/libavformat/isom.c
index ccf4ca1e842e14eb3ea8ae880657f2f8769d886c..0d4e32f2d4fe0ca2a2741d29436828a51e53961a 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "avformat.h"
 #include "internal.h"
 #include "isom.h"
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 849ade0b2dae99f9820156b48abb60930933a017..2d87a0861e8970792771bf7e24b16bad0d5a713a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -25,7 +25,6 @@
 
 #include <limits.h>
 
-//#define DEBUG
 //#define MOV_EXPORT_ALL_METADATA
 
 #include "libavutil/attributes.h"
diff --git a/libavformat/mux.c b/libavformat/mux.c
index a7e2e9ad155a6eb342eef86f2d68acd2a378efa9..b51f906c4fba9c3c3bf653696c249f615bb43440 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* #define DEBUG */
-
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"
diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c
index 7e3a6900103fdec3b8824e6f8117c3d1667a97a4..d2039f6c35af10c4c09b5d9d1eecec941db69be4 100644
--- a/libavformat/mxfdec.c
+++ b/libavformat/mxfdec.c
@@ -43,8 +43,6 @@
  * Only tracks with associated descriptors will be decoded. "Highly Desirable" SMPTE 377M D.1
  */
 
-//#define DEBUG
-
 #include "libavutil/aes.h"
 #include "libavutil/mathematics.h"
 #include "libavcodec/bytestream.h"
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 698e6699a730de13775a54f6cbdc707106b07ed2..a4403d5f497e9db12778252bec333e792b22a24d 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -30,8 +30,6 @@
  * SMPTE RP224: Registry of SMPTE Universal Labels
  */
 
-//#define DEBUG
-
 #include <inttypes.h>
 #include <math.h>
 #include <time.h>
diff --git a/libavformat/r3d.c b/libavformat/r3d.c
index 9745b3902aaedbf98eee8d2c6f929377f7724677..1da8b88d5b378e363dd5357b97a47872e5a0dc14 100644
--- a/libavformat/r3d.c
+++ b/libavformat/r3d.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-//#define DEBUG
-
 #include "libavutil/intreadwrite.h"
 #include "libavutil/dict.h"
 #include "libavutil/mathematics.h"
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c
index d1141af876cf32f8403118b94a10dc986f4ebb59..94f7aaef40b796aa2ffdb2c6b5663d18169f0cdd 100644
--- a/libavformat/rtmpproto.c
+++ b/libavformat/rtmpproto.c
@@ -48,8 +48,6 @@
 #include <zlib.h>
 #endif
 
-//#define DEBUG
-
 #define APP_MAX_LENGTH 128
 #define PLAYPATH_MAX_LENGTH 256
 #define TCURL_MAX_LENGTH 512
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index d0140ee6b870fe4b53417f52775f6e41addb8358..c82a73a84c4c5c2a99847da75fc79f78fa3e83a4 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -28,8 +28,6 @@
 
 #include "rtpenc.h"
 
-//#define DEBUG
-
 static const AVOption options[] = {
     FF_RTP_FLAG_OPTS(RTPMuxContext, flags),
     { "payload_type", "Specify RTP payload type", offsetof(RTPMuxContext, payload_type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, 127, AV_OPT_FLAG_ENCODING_PARAM },
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 3351c34a5887057b8c147fbe298adad26e2abc6c..761aa11540be5edb7bec8edee3ca2d555149d405 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -48,8 +48,6 @@
 #include "rtpenc.h"
 #include "mpegts.h"
 
-//#define DEBUG
-
 /* Timeout values for socket poll, in ms,
  * and read_packet(), in seconds  */
 #define POLL_TIMEOUT_MS 100
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 75dc3631e294a564dbf0b24c4cd317e266b369aa..eb0188655a999e83d3bafcb57c18c175314a995d 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/* #define DEBUG */
-
 #include "avformat.h"
 #include "avio_internal.h"
 #include "internal.h"