diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 14:32:18 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 15:01:41 +0400 |
commit | a4d3757b29b5e9affd97cbc4e6fc2d202378610b (patch) | |
tree | 11fcdd0668836e62b9b999292ff2a33bbc0bbbb8 /libavformat/network.c | |
parent | ecbd96ed23f07dfabc613b3fa2dcf394b2863203 (diff) | |
parent | 90f9a5830b5d332de7ebb1ab45589f1870cbd65d (diff) |
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
w32pthreads: move from lavc to compat/
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.c')
-rw-r--r-- | libavformat/network.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/network.c b/libavformat/network.c index ceed719356..abb89b331e 100644 --- a/libavformat/network.c +++ b/libavformat/network.c @@ -31,7 +31,7 @@ #elif HAVE_OS2THREADS #include "libavcodec/os2threads.h" #else -#include "libavcodec/w32pthreads.h" +#include "compat/w32pthreads.h" #endif #endif |