OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0443c1
)
ffprobe: make function replacement macros behave correctly
author
Michael Niedermayer
<michael@niedermayer.cc>
Sun, 7 May 2017 20:30:59 +0000
(22:30 +0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 8 May 2017 01:25:17 +0000
(
03:25
+0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
ffprobe.c
patch
|
blob
|
history
diff --git
a/ffprobe.c
b/ffprobe.c
index
dd4358d
..
8129bce
100644
(file)
--- a/
ffprobe.c
+++ b/
ffprobe.c
@@
-57,11
+57,11
@@
# ifdef pthread_mutex_lock
# undef pthread_mutex_lock
# endif
-# define pthread_mutex_lock(a)
+# define pthread_mutex_lock(a)
do{}while(0)
# ifdef pthread_mutex_unlock
# undef pthread_mutex_unlock
# endif
-# define pthread_mutex_unlock(a)
+# define pthread_mutex_unlock(a)
do{}while(0)
#endif
typedef struct InputStream {