[FFmpeg-devel] [PATCH] RTP: use dprintf(), allow compilation with -DDEBUG

[Mans Rullgard]

---
 libavformat/rtpdec.c |    8 ++------
 libavformat/rtpenc.c |   12 +++---------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 608612b..1a43bba 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -250,13 +250,9 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count)
     len = url_close_dyn_buf(pb, &buf);
     if ((len > 0) && buf) {
         int result;
-#if defined(DEBUG)
-        printf("sending %d bytes of RR\n", len);
-#endif
+        dprintf(NULL, "sending %d bytes of RR\n", len);
         result= url_write(s->rtp_ctx, buf, len);
-#if defined(DEBUG)
-        printf("result from url_write: %d\n", result);
-#endif
+        dprintf(NULL, "result from url_write: %d\n", result);
         av_free(buf);
     }
     return 0;
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index f65942d..2317f5c 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -120,9 +120,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time)
     RTPDemuxContext *s = s1->priv_data;
     uint32_t rtp_ts;
 
-#if defined(DEBUG)
-    printf("RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
-#endif
+    dprintf(s1, "RTCP: %02x %"PRIx64" %x\n", s->payload_type, ntp_time, s->timestamp);
 
     if (s->first_rtcp_ntp_time == AV_NOPTS_VALUE) s->first_rtcp_ntp_time = ntp_time;
     s->last_rtcp_ntp_time = ntp_time;
@@ -146,9 +144,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m)
 {
     RTPDemuxContext *s = s1->priv_data;
 
-#ifdef DEBUG
-    printf("rtp_send_data size=%d\n", len);
-#endif
+    dprintf(s1, "rtp_send_data size=%d\n", len);
 
     /* build the RTP header */
     put_byte(s1->pb, (RTP_VERSION << 6));
@@ -301,9 +297,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
     int size= pkt->size;
     uint8_t *buf1= pkt->data;
 
-#ifdef DEBUG
-    printf("%d: write len=%d\n", pkt->stream_index, size);
-#endif
+    dprintf(s1, "%d: write len=%d\n", pkt->stream_index, size);
 
     rtcp_bytes = ((s->octet_count - s->last_octet_count) * RTCP_TX_RATIO_NUM) /
         RTCP_TX_RATIO_DEN;
-- 
1.5.6.2