har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify

Browse Source 
Originally committed as revision 5737 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-07-14 00:20:04 +00:00
parent 1dd590619a
commit 6d3d62b3d3
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libavutil/common.h
View File

@ -197,25 +197,12 @@ typedef uint64_t uint_fast64_t;
#elif defined (CONFIG_OS2) #elif defined (CONFIG_OS2)
/* OS/2 EMX */ /* 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 HAVE_AV_CONFIG_H
#ifdef USE_FASTMEMCPY
#include "fastmemcpy.h"
#endif
#include <float.h> #include <float.h>
#endif /* HAVE_AV_CONFIG_H */ #endif /* HAVE_AV_CONFIG_H */
#endif /* !__MINGW32__ && CONFIG_OS2 */
/* CONFIG_OS2 end */
#else
/* unix */
#ifndef int64_t_C #ifndef int64_t_C
#define int64_t_C(c) (c ## LL) #define int64_t_C(c) (c ## LL)
@ -223,15 +210,9 @@ typedef uint64_t uint_fast64_t;
#endif #endif
#ifdef HAVE_AV_CONFIG_H #ifdef HAVE_AV_CONFIG_H
# ifdef USE_FASTMEMCPY # ifdef USE_FASTMEMCPY
# include "fastmemcpy.h" # include "fastmemcpy.h"
# endif # endif
# endif /* HAVE_AV_CONFIG_H */
#endif /* !__MINGW32__ && !CONFIG_OS2 */
#ifdef HAVE_AV_CONFIG_H
#if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV) #if defined(__MINGW32__) && !defined(BUILD_AVUTIL) && defined(BUILD_SHARED_AV)
# define FF_IMPORT_ATTR __declspec(dllimport) # define FF_IMPORT_ATTR __declspec(dllimport)