[SCM] libav/experimental: Fix warnings in tree.c test code.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:42:58 UTC 2013


The following commit has been merged in the experimental branch:
commit 168fffdf0194989d4c8a01d89b8ef2fbdd90e287
Author: Benoit Fouet <benoit.fouet at free.fr>
Date:   Tue Mar 31 14:00:46 2009 +0000

    Fix warnings in tree.c test code.
    
    Originally committed as revision 18267 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/tree.c b/libavutil/tree.c
index 2267969..e651e65 100644
--- a/libavutil/tree.c
+++ b/libavutil/tree.c
@@ -167,19 +167,20 @@ static void print(AVTreeNode *t, int depth){
     int i;
     for(i=0; i<depth*4; i++) av_log(NULL, AV_LOG_ERROR, " ");
     if(t){
-        av_log(NULL, AV_LOG_ERROR, "Node %p %2d %4d\n", t, t->state, t->elem);
+        av_log(NULL, AV_LOG_ERROR, "Node %p %2d %p\n", t, t->state, t->elem);
         print(t->child[0], depth+1);
         print(t->child[1], depth+1);
     }else
         av_log(NULL, AV_LOG_ERROR, "NULL\n");
 }
 
-static int cmp(const void *a, const void *b){
-    return a-b;
+static int cmp(void *a, const void *b){
+    return (uint8_t*)a-(const uint8_t*)b;
 }
 
 int main(void){
-    int i,k;
+    int i;
+    void *k;
     AVTreeNode *root= NULL, *node=NULL;
     AVLFG prn;
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list