Commit f190f676 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Replace custom DEBUG preprocessor trickery by the standard one.

parent 068aa387
...@@ -1760,7 +1760,7 @@ static int http_parse_request(HTTPContext *c) ...@@ -1760,7 +1760,7 @@ static int http_parse_request(HTTPContext *c)
} }
} }
#ifdef DEBUG_WMP #ifdef DEBUG
http_log("\nGot request:\n%s\n", c->buffer); http_log("\nGot request:\n%s\n", c->buffer);
#endif #endif
...@@ -1790,7 +1790,7 @@ static int http_parse_request(HTTPContext *c) ...@@ -1790,7 +1790,7 @@ static int http_parse_request(HTTPContext *c)
return 0; return 0;
} }
#ifdef DEBUG_WMP #ifdef DEBUG
if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0) if (strcmp(stream->filename + strlen(stream->filename) - 4, ".asf") == 0)
http_log("\nGot request:\n%s\n", c->buffer); http_log("\nGot request:\n%s\n", c->buffer);
#endif #endif
......
...@@ -66,7 +66,6 @@ ...@@ -66,7 +66,6 @@
#define SUBBAND_SIZE 20 #define SUBBAND_SIZE 20
#define MAX_SUBPACKETS 5 #define MAX_SUBPACKETS 5
//#define COOKDEBUG
typedef struct { typedef struct {
int *now; int *now;
...@@ -1005,7 +1004,7 @@ static int cook_decode_frame(AVCodecContext *avctx, ...@@ -1005,7 +1004,7 @@ static int cook_decode_frame(AVCodecContext *avctx,
return avctx->block_align; return avctx->block_align;
} }
#ifdef COOKDEBUG #ifdef DEBUG
static void dump_cook_context(COOKContext *q) static void dump_cook_context(COOKContext *q)
{ {
//int i=0; //int i=0;
...@@ -1247,7 +1246,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx) ...@@ -1247,7 +1246,7 @@ static av_cold int cook_decode_init(AVCodecContext *avctx)
else else
avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
#ifdef COOKDEBUG #ifdef DEBUG
dump_cook_context(q); dump_cook_context(q);
#endif #endif
return 0; return 0;
......
...@@ -629,7 +629,7 @@ static int decode_band(IVI5DecContext *ctx, int plane_num, ...@@ -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]); FFSWAP(int16_t, band->rv_map->valtab[idx1], band->rv_map->valtab[idx2]);
} }
#if IVI_DEBUG #ifdef DEBUG
if (band->checksum_present) { if (band->checksum_present) {
uint16_t chksum = ivi_calc_band_checksum(band); uint16_t chksum = ivi_calc_band_checksum(band);
if (chksum != band->checksum) { if (chksum != band->checksum) {
......
...@@ -563,7 +563,7 @@ void ff_ivi_process_empty_tile(AVCodecContext *avctx, IVIBandDesc *band, ...@@ -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) uint16_t ivi_calc_band_checksum (IVIBandDesc *band)
{ {
int x, y; int x, y;
......
...@@ -33,8 +33,6 @@ ...@@ -33,8 +33,6 @@
#include "get_bits.h" #include "get_bits.h"
#include <stdint.h> #include <stdint.h>
#define IVI_DEBUG 0
#define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes #define IVI_VLC_BITS 13 ///< max number of bits of the ivi's huffman codes
/** /**
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
*/ */
//#define DEBUG_SVQ1
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "mpegvideo.h" #include "mpegvideo.h"
...@@ -705,9 +704,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, ...@@ -705,9 +704,7 @@ static int svq1_decode_frame(AVCodecContext *avctx,
result = svq1_decode_block_intra (&s->gb, &current[x], linesize); result = svq1_decode_block_intra (&s->gb, &current[x], linesize);
if (result != 0) if (result != 0)
{ {
//#ifdef DEBUG_SVQ1
av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_block %i (keyframe)\n",result); av_log(s->avctx, AV_LOG_INFO, "Error in svq1_decode_block %i (keyframe)\n",result);
//#endif
goto err; goto err;
} }
} }
......
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#undef V_DEBUG
//#define V_DEBUG
#define ALT_BITSTREAM_READER_LE #define ALT_BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
...@@ -57,7 +54,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) ...@@ -57,7 +54,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
unsigned i, j, p, code; unsigned i, j, p, code;
#ifdef V_DEBUG #ifdef DEBUG
GetBitContext gb; GetBitContext gb;
#endif #endif
...@@ -74,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) ...@@ -74,7 +71,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
for (i = 0; i < bits[p]; ++i) for (i = 0; i < bits[p]; ++i)
exit_at_level[i+1] = 1 << 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]); 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]); init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]);
for (i = 0; i < bits[p]; ++i) for (i = 0; i < bits[p]; ++i)
...@@ -102,7 +99,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) ...@@ -102,7 +99,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num)
exit_at_level[j] = code + (1 << (j - 1)); exit_at_level[j] = code + (1 << (j - 1));
codes[p] = code; 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]); 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]); init_get_bits(&gb, (uint8_t *)&codes[p], bits[p]);
for (i = 0; i < bits[p]; ++i) for (i = 0; i < bits[p]; ++i)
......
...@@ -33,9 +33,6 @@ ...@@ -33,9 +33,6 @@
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#undef DV1394_DEBUG
#include "libavformat/dv.h" #include "libavformat/dv.h"
#include "dv1394.h" #include "dv1394.h"
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include <windows.h> #include <windows.h>
#include <vfw.h> #include <vfw.h>
//#define DEBUG_VFW
/* Defines for VFW missing from MinGW. /* Defines for VFW missing from MinGW.
* Remove this when MinGW incorporates them. */ * Remove this when MinGW incorporates them. */
#define HWND_MESSAGE ((HWND)-3) #define HWND_MESSAGE ((HWND)-3)
...@@ -122,7 +120,7 @@ static void dump_captureparms(AVFormatContext *s, CAPTUREPARMS *cparms) ...@@ -122,7 +120,7 @@ static void dump_captureparms(AVFormatContext *s, CAPTUREPARMS *cparms)
static void dump_videohdr(AVFormatContext *s, VIDEOHDR *vhdr) static void dump_videohdr(AVFormatContext *s, VIDEOHDR *vhdr)
{ {
#ifdef DEBUG_VFW #ifdef DEBUG
av_log(s, AV_LOG_DEBUG, "VIDEOHDR\n"); av_log(s, AV_LOG_DEBUG, "VIDEOHDR\n");
dstruct(s, vhdr, lpData, "p"); dstruct(s, vhdr, lpData, "p");
dstruct(s, vhdr, dwBufferLength, "lu"); dstruct(s, vhdr, dwBufferLength, "lu");
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#include "avformat.h" #include "avformat.h"
#include "apetag.h" #include "apetag.h"
#define ENABLE_DEBUG 0
/* The earliest and latest file formats supported by this library */ /* The earliest and latest file formats supported by this library */
#define APE_MIN_VERSION 3950 #define APE_MIN_VERSION 3950
#define APE_MAX_VERSION 3990 #define APE_MAX_VERSION 3990
...@@ -96,7 +94,7 @@ static int ape_probe(AVProbeData * p) ...@@ -96,7 +94,7 @@ static int ape_probe(AVProbeData * p)
static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx) static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx)
{ {
#if ENABLE_DEBUG #ifdef DEBUG
int i; int i;
av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n"); av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n");
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
#include "avformat.h" #include "avformat.h"
#include "apetag.h" #include "apetag.h"
#define ENABLE_DEBUG 0
#define APE_TAG_VERSION 2000 #define APE_TAG_VERSION 2000
#define APE_TAG_FOOTER_BYTES 32 #define APE_TAG_FOOTER_BYTES 32
#define APE_TAG_FLAG_CONTAINS_HEADER (1 << 31) #define APE_TAG_FLAG_CONTAINS_HEADER (1 << 31)
......
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include "url.h" #include "url.h"
//#define DEBUG //#define DEBUG
//#define DEBUG_RTP_TCP
/* Timeout values for socket poll, in ms, /* Timeout values for socket poll, in ms,
* and read_packet(), in seconds */ * and read_packet(), in seconds */
...@@ -860,9 +859,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply, ...@@ -860,9 +859,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
q = buf; q = buf;
for (;;) { for (;;) {
ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1); ret = ffurl_read_complete(rt->rtsp_hd, &ch, 1);
#ifdef DEBUG_RTP_TCP
av_dlog(s, "ret=%d c=%02x [%c]\n", ret, ch, ch); av_dlog(s, "ret=%d c=%02x [%c]\n", ret, ch, ch);
#endif
if (ret != 1) if (ret != 1)
return AVERROR_EOF; return AVERROR_EOF;
if (ch == '\n') if (ch == '\n')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment