[SCM] libav/experimental: 10000l

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 64c020a8aba838ea89d1517ff40ac66a847140b4
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Apr 5 10:27:26 2004 +0000

    10000l
    
    Originally committed as revision 2966 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 664ecf7..35a8fd0 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -34,6 +34,7 @@
 #include <sys/select.h>
 #include <stdlib.h>
 #endif
+#undef time //needed because HAVE_AV_CONFIG_H is defined on top
 #include <time.h>
 
 #include "cmdutils.h"

-- 
Libav/FFmpeg packaging