[FFmpeg-cvslog] Remove commented-out debug #define cruft
Diego Biurrun
git at videolan.org
Thu May 16 10:02:12 CEST 2013
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed May 15 15:16:12 2013 +0200| [2832ea26f3f792ba0d0b7682a6f33fd05dea3850] | committer: Diego Biurrun
Remove commented-out debug #define cruft
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2832ea26f3f792ba0d0b7682a6f33fd05dea3850
---
libavcodec/4xm.c | 3 ---
libavcodec/ac3enc.c | 2 --
libavcodec/alsdec.c | 4 ----
libavcodec/asvdec.c | 3 ---
libavcodec/dnxhddec.c | 3 ---
libavcodec/dnxhdenc.c | 1 -
libavcodec/dsputil.h | 3 ---
libavcodec/dvdsubdec.c | 2 --
libavcodec/gifdec.c | 2 --
libavcodec/h263.c | 3 ---
libavcodec/h263dec.c | 2 --
libavcodec/ituh263dec.c | 4 ----
libavcodec/ituh263enc.c | 4 ----
libavcodec/mpeg12.c | 4 ----
libavcodec/mpeg12dec.c | 4 ----
libavcodec/mpegaudiodecheader.c | 1 -
libavcodec/mpegvideo.c | 6 ------
libavcodec/mpegvideo_enc.c | 5 -----
libavcodec/msmpeg4.c | 1 -
libavcodec/pngdec.c | 2 --
libavcodec/pngenc.c | 2 --
libavcodec/rv10.c | 2 --
libavcodec/rv34.c | 2 --
libavcodec/tta.c | 1 -
libavdevice/fbdev.c | 2 --
libavfilter/avfilter.c | 2 --
libavfilter/setpts.c | 2 --
libavfilter/vf_crop.c | 2 --
libavfilter/vf_fieldorder.c | 2 --
libavfilter/vf_frei0r.c | 2 --
libavfilter/vf_libopencv.c | 2 --
libavfilter/vsrc_movie.c | 2 --
libavformat/asfdec.c | 2 --
libavformat/isom.c | 2 --
libavformat/mov.c | 1 -
libavformat/mux.c | 2 --
libavformat/mxfdec.c | 2 --
libavformat/mxfenc.c | 2 --
libavformat/r3d.c | 2 --
libavformat/rtmpproto.c | 2 --
libavformat/rtpenc.c | 2 --
libavformat/rtsp.c | 2 --
libavformat/utils.c | 2 --
43 files changed, 103 deletions(-)
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index e34fa1d..fd03134 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 d372028..ce6c1a6 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 3d419bb..8451edb 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 a124687..9f74abb 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 ab6636c..0a8bc59 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 920fa45..c834ec3 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 029591b..3add4e8 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 970da86..eadde32 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 9b74d34..d8a3b74 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 c097033..0a7ec87 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 014033f..313012a 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 b528f2f..25dd4d9 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 54629a2..0f59944 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 8bc5697..528e676 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 16c8523..6751864 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 f8fc833..69dda45 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 a52d04a..d958b96 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 24b775e..98292fa 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 3985f19..f844850 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 5b82298..ec44d56 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 b20a6d6..7f601ca 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 e4003a3..0d3b648 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 aedf417..af37855 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 b496452..e9c4285 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 7680b29..b820a4a 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 e2062a1..b9939a0 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 7a1f4f3..9fa1df5 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 4dd93c8..c10c431 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 c002b65..a5b85e2 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 452fec0..c409178 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 44f0037..fff9a44 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 720f077..9cde9d4 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 e30d47c..a7fdc9e 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 ccf4ca1..0d4e32f 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 849ade0..2d87a08 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 a7e2e9a..b51f906 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 7e3a690..d2039f6 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 698e669..a4403d5 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 9745b39..1da8b88 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 d1141af..94f7aae 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 d0140ee..c82a73a 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 3351c34..761aa11 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 75dc363..eb01886 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"
More information about the ffmpeg-cvslog
mailing list