diff options
author | Diego Biurrun <diego@biurrun.de> | 2011-06-03 00:45:15 +0400 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2011-06-03 02:44:06 +0400 |
commit | f190f676bc93a7e80344f2feeb3b9b44604d4717 (patch) | |
tree | d450a39677cd2e45abdea10256675ac7267cce92 /libavcodec | |
parent | 068aa387128850da488af262d54986d03eebe423 (diff) |
Replace custom DEBUG preprocessor trickery by the standard one.
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/cook.c | 5 | ||||
-rw-r--r-- | libavcodec/indeo5.c | 2 | ||||
-rw-r--r-- | libavcodec/ivi_common.c | 2 | ||||
-rw-r--r-- | libavcodec/ivi_common.h | 2 | ||||
-rw-r--r-- | libavcodec/svq1dec.c | 3 | ||||
-rw-r--r-- | libavcodec/vorbis.c | 9 |
6 files changed, 7 insertions, 16 deletions
diff --git a/libavcodec/cook.c b/libavcodec/cook.c index e6e2508c84..84211a6d08 100644 --- a/libavcodec/cook.c +++ b/libavcodec/cook.c @@ -66,7 +66,6 @@ #define SUBBAND_SIZE 20 #define MAX_SUBPACKETS 5 -//#define COOKDEBUG typedef struct { int *now; @@ -1005,7 +1004,7 @@ static int cook_decode_frame(AVCodecContext *avctx, return avctx->block_align; } -#ifdef COOKDEBUG +#ifdef DEBUG static void dump_cook_context(COOKContext *q) { //int i=0; @@ -1247,7 +1246,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) else avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; -#ifdef COOKDEBUG +#ifdef DEBUG dump_cook_context(q); #endif return 0; diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 088b45a263..ba1bc18eff 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -629,7 +629,7 @@ static int decode_band(IVI5DecContext *ctx, int plane_num, FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]); } -#if IVI_DEBUG +#ifdef DEBUG if (band->checksum_present) { uint16_t chksum = ivi_calc_band_checksum(band); if (chksum != band->checksum) { diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 2b684e8b9e..bd3d4e6fd4 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -563,7 +563,7 @@ void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, } -#if IVI_DEBUG +#ifdef DEBUG uint16_t ivi_calc_band_checksum (IVIBandDesc *band) { int x, y; diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi_common.h index 0a5e9b1384..fd3d82515a 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi_common.h @@ -33,8 +33,6 @@ #include "get_bits.h" #include <stdint.h> -#define IVI_DEBUG 0 - #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes /** diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index ef4cde1b7f..fc36bc3489 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -33,7 +33,6 @@ */ -//#define DEBUG_SVQ1 #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -705,9 +704,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, result = svq1_decode_block_intra (&s->gb, ¤t[x], linesize); if (result != 0) { -//#ifdef DEBUG_SVQ1 av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_block %i (keyframe)\n",result); -//#endif goto err; } } diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 7198abe38d..f413170b6a 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#undef V_DEBUG -//#define V_DEBUG - #define ALT_BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" @@ -57,7 +54,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) unsigned i, j, p, code; -#ifdef V_DEBUG +#ifdef DEBUG GetBitContext gb; #endif @@ -74,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) for (i = 0; i < bits[p]; ++i) exit_at_level[i+1] = 1 << i; -#ifdef V_DEBUG +#ifdef DEBUG av_log(NULL, AV_LOG_INFO, " %u. of %u code len %d code %d - ", p, num, bits[p], codes[p]); init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]); for (i = 0; i < bits[p]; ++i) @@ -102,7 +99,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) exit_at_level[j] = code + (1 << (j - 1)); codes[p] = code; -#ifdef V_DEBUG +#ifdef DEBUG av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]); init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]); for (i = 0; i < bits[p]; ++i) |