[SCM] libav/experimental: printf-> av_log patch by (Benjamin Larsson, banan: student ltu se)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 58379c062f098482a54bf8a178150e0bf6d5e4ee
Author: Benjamin Larsson <banan at ludd.ltu.se>
Date:   Wed Jul 13 10:18:35 2005 +0000

    printf-> av_log patch by (Benjamin Larsson, banan: student ltu se)
    
    Originally committed as revision 4437 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/framehook.c b/libavformat/framehook.c
index ee390e4..18be8a7 100644
--- a/libavformat/framehook.c
+++ b/libavformat/framehook.c
@@ -49,7 +49,7 @@ int frame_hook_add(int argc, char *argv[])
 
     loaded = dlopen(argv[0], RTLD_NOW);
     if (!loaded) {
-        fprintf(stderr, "%s\n", dlerror());
+        av_log(NULL, AV_LOG_ERROR, "%s\n", dlerror());
         return -1;
     }
 
@@ -63,18 +63,18 @@ int frame_hook_add(int argc, char *argv[])
     fhe->Release = dlsym(loaded, "Release");    /* Optional */
 
     if (!fhe->Process) {
-        fprintf(stderr, "Failed to find Process entrypoint in %s\n", argv[0]);
+        av_log(NULL, AV_LOG_ERROR, "Failed to find Process entrypoint in %s\n", argv[0]);
         return -1;
     }
 
     if (!fhe->Configure && argc > 1) {
-        fprintf(stderr, "Failed to find Configure entrypoint in %s\n", argv[0]);
+        av_log(NULL, AV_LOG_ERROR, "Failed to find Configure entrypoint in %s\n", argv[0]);
         return -1;
     }
 
     if (argc > 1 || fhe->Configure) {
         if (fhe->Configure(&fhe->ctx, argc, argv)) {
-            fprintf(stderr, "Failed to Configure %s\n", argv[0]);
+            av_log(NULL, AV_LOG_ERROR, "Failed to Configure %s\n", argv[0]);
             return -1;
         }
     }
@@ -86,7 +86,7 @@ int frame_hook_add(int argc, char *argv[])
 
     return 0;
 #else
-    fprintf(stderr, "Video hooking not compiled into this version\n");
+    av_log(NULL, AV_LOG_ERROR, "Video hooking not compiled into this version\n");
     return 1;
 #endif
 }
diff --git a/libavformat/sierravmd.c b/libavformat/sierravmd.c
index 152b4fb..09b7a74 100644
--- a/libavformat/sierravmd.c
+++ b/libavformat/sierravmd.c
@@ -290,7 +290,7 @@ static int vmd_read_packet(AVFormatContext *s,
             pkt->data, pkt->size, vmd->audio_block_align);
 
     }
-printf (" dispatching %s frame with %d bytes and pts %lld (%0.1f sec)\n",
+av_log(NULL, AV_LOG_INFO, " dispatching %s frame with %d bytes and pts %lld (%0.1f sec)\n",
   (frame->frame_record[0] == 0x02) ? "video" : "audio",
   frame->frame_size + BYTES_PER_FRAME_RECORD,
   pkt->pts, (float)(pkt->pts / 90000.0));
diff --git a/libavformat/udp.c b/libavformat/udp.c
index 8b5fc32..50aa14b 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -133,7 +133,7 @@ struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type,
         hints.ai_family   = family;
         hints.ai_flags = flags; 
         if ((error = getaddrinfo(node, service, &hints, &res))) {
-            fprintf(stderr, "udp_ipv6_resolve_host: %s\n", gai_strerror(error));
+            av_log(NULL, AV_LOG_ERROR, "udp_ipv6_resolve_host: %s\n", gai_strerror(error));
         }
     }
     return res;

-- 
Libav/FFmpeg packaging