diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 10:44:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 10:44:34 +0100 |
| commit | 4eea41cba1e1142060e53da2b2367a351d78c766 (patch) | |
| tree | 7a09b24e99c866d63fbd057fb8a7d7be93e5e437 /libavcodec/Makefile | |
| parent | 3d4dc43259e2f58e7f55f2152094a1ee4333bfd2 (diff) | |
| parent | cc14ee03a7b91c69343f8d60c9e089a1950eeadb (diff) | |
Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb'
* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
lavc: split slice and frame threading functions into separate files
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 407a1300df..4283f8919a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -801,9 +801,9 @@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o # thread libraries -OBJS-$(HAVE_PTHREADS) += pthread.o -OBJS-$(HAVE_W32THREADS) += pthread.o -OBJS-$(HAVE_OS2THREADS) += pthread.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-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o |