virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da'

Browse Source 
* commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da':
  Employ consistent LIBAV_COMPAT_ multiple inclusion guards in compat/

Conflicts:
	compat/aix/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-19 10:56:10 +02:00
commit c88503e3f6
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compat/aix/math.h
View File

@ -1,9 +1,8 @@
/* /* Work around the class() function in AIX math.h clashing with identifiers
* Workaround aix-specific class() function clashing with ffmpeg class usage * named "class". */
*/
#ifndef COMPAT_AIX_MATH_H #ifndef FFMPEG_COMPAT_AIX_MATH_H
#define COMPAT_AIX_MATH_H #define FFMPEG_COMPAT_AIX_MATH_H
#define class class_in_math_h_causes_problems #define class class_in_math_h_causes_problems
@ -11,4 +10,4 @@
#undef class #undef class
#endif /* COMPAT_AIX_MATH_H */ #endif /* FFMPEG_COMPAT_AIX_MATH_H */

5
compat/tms470/math.h
View File

@ -1,3 +1,6 @@
#ifndef FFMPEG_COMPAT_TMS470_MATH_H
#define FFMPEG_COMPAT_TMS470_MATH_H
#include_next <math.h> #include_next <math.h>
#undef INFINITY #undef INFINITY
@ -5,3 +8,5 @@
#define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 })) #define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
#define NAN (*(const float*)((const unsigned []){ 0x7fc00000 })) #define NAN (*(const float*)((const unsigned []){ 0x7fc00000 }))
#endif /* FFMPEG_COMPAT_TMS470_MATH_H */

6
compat/w32pthreads.h
View File

@ -26,8 +26,8 @@
* w32threads to pthreads wrapper * w32threads to pthreads wrapper
*/ */
#ifndef LIBAV_W32PTHREADS_H #ifndef FFMPEG_COMPAT_W32PTHREADS_H
#define LIBAV_W32PTHREADS_H #define FFMPEG_COMPAT_W32PTHREADS_H
/* Build up a pthread-like API using underlying Windows API. Have only static /* Build up a pthread-like API using underlying Windows API. Have only static
* methods so as to not conflict with a potentially linked in pthread-win32 * methods so as to not conflict with a potentially linked in pthread-win32
@ -277,4 +277,4 @@ static void w32thread_init(void)
} }
#endif /* LIBAV_W32PTHREADS_H */ #endif /* FFMPEG_COMPAT_W32PTHREADS_H */

2
libavutil/arm/cpu.h
View File

@ -29,4 +29,4 @@
#define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3)) #define have_vfpv3(flags) (HAVE_VFPV3 && ((flags) & AV_CPU_FLAG_VFPV3))
#define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON)) #define have_neon(flags) (HAVE_NEON && ((flags) & AV_CPU_FLAG_NEON))
#endif #endif /* AVUTIL_ARM_CPU_H */