aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-06-06 00:53:31 +0200
committerDiego Biurrun <diego@biurrun.de>2011-06-07 13:20:58 +0200
commit1f6b9cc31d086860c7a7887685bed321fe3843f4 (patch)
tree255e95c24141197df11f2e837950e1d172423e17 /libavcodec
parentf8ea0eb6ff5719a3ff2a60454dd0a2b07aa6dbe2 (diff)
downloadffmpeg-1f6b9cc31d086860c7a7887685bed321fe3843f4.tar.gz
Replace some nonstandard DEBUG_* preprocessor directives by plain DEBUG.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/dvbsubdec.c7
-rw-r--r--libavcodec/ppc/h264_template_altivec.c3
2 files changed, 4 insertions, 6 deletions
diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 2c27f6b527..b6b57b8915 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -26,7 +26,6 @@
//#define DEBUG
//#define DEBUG_PACKET_CONTENTS
-//#define DEBUG_SAVE_IMAGES
#define DVBSUB_PAGE_SEGMENT 0x10
#define DVBSUB_REGION_SEGMENT 0x11
@@ -37,7 +36,7 @@
#define cm (ff_cropTbl + MAX_NEG_CROP)
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
#undef fprintf
#if 0
static void png_save(const char *filename, uint8_t *bitmap, int w, int h,
@@ -1174,7 +1173,7 @@ static void dvbsub_parse_page_segment(AVCodecContext *avctx,
}
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
static void save_display_set(DVBSubContext *ctx)
{
DVBSubRegion *region;
@@ -1387,7 +1386,7 @@ static int dvbsub_display_end_segment(AVCodecContext *avctx, const uint8_t *buf,
sub->num_rects = i;
-#ifdef DEBUG_SAVE_IMAGES
+#ifdef DEBUG
save_display_set(ctx);
#endif
diff --git a/libavcodec/ppc/h264_template_altivec.c b/libavcodec/ppc/h264_template_altivec.c
index 020d7c7023..2a8f4bf672 100644
--- a/libavcodec/ppc/h264_template_altivec.c
+++ b/libavcodec/ppc/h264_template_altivec.c
@@ -18,8 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-//#define DEBUG_ALIGNMENT
-#ifdef DEBUG_ALIGNMENT
+#ifdef DEBUG
#define ASSERT_ALIGNED(ptr) assert(((unsigned long)ptr&0x0000000F));
#else
#define ASSERT_ALIGNED(ptr) ;