diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 21:33:13 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-13 21:33:13 +0100 |
| commit | 0f242e62b4b4f4da08b4e8e49aa1e4c2900a51f6 (patch) | |
| tree | a6eda1aece06d81dc915478dcef6fedeea3b84c3 | |
| parent | 1e3718e2a1e70ae13785c566a197552eac7eda39 (diff) | |
| parent | 79d9884e9590c28a0a7ca802a3ba54f2ff4ee423 (diff) | |
| download | ffmpeg-0f242e62b4b4f4da08b4e8e49aa1e4c2900a51f6.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Merge pthreads/w32threads OBJS declarations
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0f6f881cf8..3927a0a0e6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -807,9 +807,7 @@ OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o # thread libraries OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o -OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o -OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o -OBJS-$(HAVE_OS2THREADS) += pthread.o pthread_slice.o pthread_frame.o +OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_frame.o OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o |