[FFmpeg-cvslog] oggdec: use av_dlog()

Stefano Sabatini git at videolan.org
Tue May 24 00:48:21 CEST 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Mon May 23 23:51:39 2011 +0200| [2ef241c09f6af4513f0558c295935708d40f2acd] | committer: Stefano Sabatini

oggdec: use av_dlog()

Simplify.

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

 libavformat/oggdec.c |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
index 7f65365..344bd1c 100644
--- a/libavformat/oggdec.c
+++ b/libavformat/oggdec.c
@@ -317,9 +317,7 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
     int complete = 0;
     int segp = 0, psize = 0;
 
-#if 0
-    av_log (s, AV_LOG_DEBUG, "ogg_packet: curidx=%i\n", ogg->curidx);
-#endif
+    av_dlog(s, "ogg_packet: curidx=%i\n", ogg->curidx);
 
     do{
         idx = ogg->curidx;
@@ -332,11 +330,8 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
 
         os = ogg->streams + idx;
 
-#if 0
-        av_log (s, AV_LOG_DEBUG,
-                "ogg_packet: idx=%d pstart=%d psize=%d segp=%d nsegs=%d\n",
+        av_dlog(s, "ogg_packet: idx=%d pstart=%d psize=%d segp=%d nsegs=%d\n",
                 idx, os->pstart, os->psize, os->segp, os->nsegs);
-#endif
 
         if (!os->codec){
             if (os->header < 0){
@@ -369,11 +364,8 @@ static int ogg_packet(AVFormatContext *s, int *str, int *dstart, int *dsize,
         }
     }while (!complete);
 
-#if 0
-    av_log (s, AV_LOG_DEBUG,
-            "ogg_packet: idx %i, frame size %i, start %i\n",
-            idx, os->psize, os->pstart);
-#endif
+    av_dlog(s, "ogg_packet: idx %i, frame size %i, start %i\n",
+           idx, os->psize, os->pstart);
 
     if (os->granule == -1)
         av_log(s, AV_LOG_WARNING, "Page at %"PRId64" is missing granule\n", os->page_pos);
@@ -452,9 +444,7 @@ static int ogg_get_headers(AVFormatContext *s)
             return ret;
     }while (!ogg->headers);
 
-#if 0
-    av_log (s, AV_LOG_DEBUG, "found headers\n");
-#endif
+    av_dlog(s, "found headers\n");
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list