diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 12:32:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-24 13:01:41 +0200 |
| commit | a4d3757b29b5e9affd97cbc4e6fc2d202378610b (patch) | |
| tree | 11fcdd0668836e62b9b999292ff2a33bbc0bbbb8 /Makefile | |
| parent | ecbd96ed23f07dfabc613b3fa2dcf394b2863203 (diff) | |
| parent | 90f9a5830b5d332de7ebb1ab45589f1870cbd65d (diff) | |
| download | ffmpeg-streaming-a4d3757b29b5e9affd97cbc4e6fc2d202378610b.zip ffmpeg-streaming-a4d3757b29b5e9affd97cbc4e6fc2d202378610b.tar.gz | |
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 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -43,7 +43,7 @@ FFLIBS := avutil DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.ffpreset) $(SRC_PATH)/doc/ffprobe.xsd EXAMPLES_FILES := $(wildcard $(SRC_PATH)/doc/examples/*.c) $(SRC_PATH)/doc/examples/Makefile $(SRC_PATH)/doc/examples/README -SKIPHEADERS = cmdutils_common_opts.h +SKIPHEADERS = cmdutils_common_opts.h compat/w32pthreads.h include $(SRC_PATH)/common.mak |
