highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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
parent 8740762c43 439902e0d6
commit c88503e3f6
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compat/w32pthreads.h
View File

@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper
*/
#ifndef LIBAV_W32PTHREADS_H
#define LIBAV_W32PTHREADS_H
#ifndef FFMPEG_COMPAT_W32PTHREADS_H
#define FFMPEG_COMPAT_W32PTHREADS_H
/* 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
@@ -277,4 +277,4 @@ static void w32thread_init(void)
}
#endif /* LIBAV_W32PTHREADS_H */
#endif /* FFMPEG_COMPAT_W32PTHREADS_H */