[FFmpeg-cvslog] Replace more disabled printf() calls by av_dlog().

Diego Biurrun git at videolan.org
Sat Apr 30 02:02:20 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Apr 29 19:18:46 2011 +0200| [09cbf60f8eec65cc53c5931234476a9956cc27fd] | committer: Diego Biurrun

Replace more disabled printf() calls by av_dlog().

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09cbf60f8eec65cc53c5931234476a9956cc27fd
---

 libavcodec/motion_est.c |    6 ++----
 libavcodec/parser.c     |    7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 8e85219..b410c95 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -1119,10 +1119,8 @@ void ff_estimate_p_frame_motion(MpegEncContext * s,
 //    pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin;
     c->mc_mb_var_sum_temp += (vard+128)>>8;
 
-#if 0
-    printf("varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
-           varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
-#endif
+    av_dlog(s, "varc=%4d avg_var=%4d (sum=%4d) vard=%4d mx=%2d my=%2d\n",
+            varc, s->avg_mb_var, sum, vard, mx - xx, my - yy);
     if(mb_type){
         int p_score= FFMIN(vard, varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*100);
         int i_score= varc-500+(s->lambda2>>FF_LAMBDA_SHIFT)*20;
diff --git a/libavcodec/parser.c b/libavcodec/parser.c
index f002173..d1f454f 100644
--- a/libavcodec/parser.c
+++ b/libavcodec/parser.c
@@ -273,12 +273,11 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_s
         pc->overread++;
     }
 
-#if 0
     if(pc->overread){
-        printf("overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index);
-        printf("%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
+        av_dlog(pc, "overread %d, state:%X next:%d index:%d o_index:%d\n",
+                pc->overread, pc->state, next, pc->index, pc->overread_index);
+        av_dlog(pc, "%X %X %X %X\n", (*buf)[0], (*buf)[1],(*buf)[2],(*buf)[3]);
     }
-#endif
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list