diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:26:46 +0200 |
| commit | e335658370840390272b70de92f5a76860537fb9 (patch) | |
| tree | 8f9074bfd2d0f5c6c09c34f23b354ee9dbce7e56 /libavcodec/Makefile | |
| parent | 43cce41267a7aa71946911e87b4dfce48183bb25 (diff) | |
| parent | 9734b8ba56d05e970c353dfd5baafa43fdb08024 (diff) | |
| download | ffmpeg-e335658370840390272b70de92f5a76860537fb9.tar.gz | |
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
Move avutil tables only used in libavcodec to libavcodec.
Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index d8fc0f0c42..2946e0dbc3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -24,6 +24,7 @@ OBJS = allcodecs.o \ fmtconvert.o \ imgconvert.o \ jrevdct.o \ + mathtables.o \ options.o \ parser.o \ raw.o \ @@ -744,12 +745,6 @@ OBJS-$(HAVE_PTHREADS) += pthread.o frame_thread_encoder.o OBJS-$(HAVE_W32THREADS) += pthread.o frame_thread_encoder.o OBJS-$(HAVE_OS2THREADS) += pthread.o frame_thread_encoder.o -# inverse.o contains the ff_inverse table definition, which is used by -# the FASTDIV macro (from libavutil); since referencing the external -# table has a negative effect on performance, copy it in libavcodec as -# well. -OBJS-$(!CONFIG_SMALL) += inverse.o - SKIPHEADERS += %_tablegen.h \ %_tables.h \ aac_tablegen_decl.h \ |