[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 6d3d62b3d356d81813b26c4bdf9c09e97b282a9c
Author: Måns Rullgård <mans at mansr.com>
Date:   Fri Jul 14 00:20:04 2006 +0000

    simplify
    
    Originally committed as revision 5737 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/common.h b/libavutil/common.h
index 3e92e29..22a2c06 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -197,25 +197,12 @@ typedef uint64_t      uint_fast64_t;
 #elif defined (CONFIG_OS2)
 /* OS/2 EMX */
 
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-
 #ifdef HAVE_AV_CONFIG_H
 
-#ifdef USE_FASTMEMCPY
-#include "fastmemcpy.h"
-#endif
-
 #include <float.h>
 
 #endif /* HAVE_AV_CONFIG_H */
-
-/* CONFIG_OS2 end */
-#else
-
-/* unix */
+#endif /* !__MINGW32__ && CONFIG_OS2 */
 
 #ifndef int64_t_C
 #define int64_t_C(c)     (c ## LL)
@@ -223,15 +210,9 @@ typedef uint64_t      uint_fast64_t;
 #endif
 
 #ifdef HAVE_AV_CONFIG_H
-
-#        ifdef USE_FASTMEMCPY
-#            include "fastmemcpy.h"
-#        endif
-#    endif /* HAVE_AV_CONFIG_H */
-
-#endif /* !__MINGW32__ && !CONFIG_OS2 */
-
-#ifdef HAVE_AV_CONFIG_H
+#    ifdef USE_FASTMEMCPY
+#        include "fastmemcpy.h"
+#    endif
 
 #if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
 #  define FF_IMPORT_ATTR __declspec(dllimport)

-- 
Libav/FFmpeg packaging