virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
8e576d5830
FFmpeg/libavutil/Makefile

92 lines
5.3 KiB
Makefile
Raw Normal View History

Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
2011-06-26 10:46:05 +03:00
include $(SUBDIR)../config.mak
cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile. Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 16:39:43 +02:00
NAME = avutil
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
HEADERS = adler32.h \
avutil: make aes and sha api public The functions are already av_ prefixed and sha1 header is already provided. Install libavutil/{aes,sha}.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-04-07 16:19:23 +03:00
aes.h \
Move gcc attribute macros to new header libavutil/attributes.h Originally committed as revision 22346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:28:56 +02:00
attributes.h \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
audioconvert.h \
Rename libavutil/assert.h to avassert.h This avoids conflicts with the system assert.h. Originally committed as revision 25284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-01 16:55:13 +03:00
avassert.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
avstring.h \
avutil.h \
base64.h \
Install bswap.h and intreadwrite.h Originally committed as revision 24174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 01:22:07 +03:00
bswap.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
common.h \
Rename FF_MM_ symbols related to CPU features flags as AV_CPU_FLAG_ symbols, and move them from libavcodec/avcodec.h to libavutil/cpu.h. Originally committed as revision 25040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-04 12:59:08 +03:00
cpu.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
crc.h \
Move error code definitions from libavcodec/avcodec.h to libavutil/error.h. Error code definitions and handling code belong to libavutil, where they can be shared by all the libav* libraries. See the thread: Subject: [FFmpeg-devel] [PATCH] Move error codes definitions from lavc to lavu Date: Sun, 19 Jul 2009 12:09:16 +0200 Originally committed as revision 22501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 11:43:24 +02:00
error.h \
Move eval.c and eval.h from libavcodec to libavutil, and make the eval API public. Originally committed as revision 23485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 15:01:28 +03:00
eval.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
fifo.h \
Add av_file_map() and av_file_unmap() functions. Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22 16:13:04 +02:00
file.h \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
imgutils.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
intfloat_readwrite.h \
Install bswap.h and intreadwrite.h Originally committed as revision 24174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 01:22:07 +03:00
intreadwrite.h \
avutil: install lfg.h Originally committed as revision 23985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 15:12:06 +03:00
lfg.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
log.h \
lzo.h \
mathematics.h \
md5.h \
mem.h \
Move metadata API from lavf to lavu. Rename it to AVDictionary, since it will be used as such. Tags documentation and metadata conversion API is lavf-specific, so remains there.
2011-05-22 13:45:00 +03:00
dict.h \
Install libavutil/opt.h, its API is public. Fix issue #2265. Originally committed as revision 25420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 02:42:25 +03:00
opt.h \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
parseutils.h \
Make the pixdesc API public. Originally committed as revision 20603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 01:33:41 +02:00
pixdesc.h \
Split avutil.h, move all the pixel format definitions to the new dedicated file pixfmt.h. Originally committed as revision 17528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 16:27:50 +02:00
pixfmt.h \
Make ff_random_get_seed public, rename to av_get_random_seed, export the header Keep an old ff_ named function for binary compatibility until the next major bump. Originally committed as revision 23254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 11:53:40 +03:00
random_seed.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
rational.h \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
samplefmt.h \
avutil: make aes and sha api public The functions are already av_ prefixed and sha1 header is already provided. Install libavutil/{aes,sha}.h Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-04-07 16:19:23 +03:00
sha.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-21 00:53:18 +02:00
Create and install libavutil/avconfig.h This file contains a safe subset of the config.h settings. Only bigendian is included for now, more can be added as need arises. Originally committed as revision 21321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 06:40:16 +02:00
BUILT_HEADERS = avconfig.h
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
OBJS = adler32.o \
aes.o \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
audioconvert.o \
Rename string.c to avstring.c so that the name of header and C file match. Originally committed as revision 16853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-30 00:12:36 +02:00
avstring.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
base64.o \
Move mm_support() from libavcodec to libavutil, make it a public function and rename it to av_get_cpu_flags(). Originally committed as revision 25076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 18:07:14 +03:00
cpu.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
crc.o \
des.o \
Implement av_strerror(). Originally committed as revision 22684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-26 00:46:35 +02:00
error.o \
Move eval.c and eval.h from libavcodec to libavutil, and make the eval API public. Originally committed as revision 23485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-05 15:01:28 +03:00
eval.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
fifo.o \
Add av_file_map() and av_file_unmap() functions. Originally committed as revision 26073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-22 16:13:04 +02:00
file.o \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
imgutils.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
intfloat_readwrite.o \
Make ff_inverse stay with libavutil, and optional copy it to libavcodec. The ff_inverse table is used by FASTDIV macro, defined in libavutil, but up to now the table was defined only in libavcodec. After this change, the main copy of ff_inverse is part of libavutil (just like FASTDIV), but if CONFIG_SMALL is unset, then a different copy is made available to libavcodec, to avoid the performance penalty of using an external look up table. Dynamic linking works, because the libraries are linked with -Bsymbolic, so the local copy of the symbol has priority over the external; static linking works because the table is on a standalone object file in both libraries, so the linker is able to discard one of the two. Tested on Linux/x86-64 and Mac OS X/x86-64. Originally committed as revision 24383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 15:37:37 +03:00
inverse.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
lfg.o \
lls.o \
log.o \
lzo.o \
mathematics.o \
md5.o \
mem.o \
Move metadata API from lavf to lavu. Rename it to AVDictionary, since it will be used as such. Tags documentation and metadata conversion API is lavf-specific, so remains there.
2011-05-22 13:45:00 +03:00
dict.o \
Move AVOptions from libavcodec to libavutil Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 17:25:22 +03:00
opt.o \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
parseutils.o \
Make the pixdesc API public. Originally committed as revision 20603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 01:33:41 +02:00
pixdesc.o \
add ff_random_get_seed to be used in conjunction with random functions Originally committed as revision 17868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-08 03:28:14 +02:00
random_seed.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
rational.o \
rc4.o \
Merge libavcore into libavutil It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-07 15:37:08 +02:00
samplefmt.o \
Prepare SHA code to handle SHA-2 as well. For now rename files and functions and leave av_sha1_* functions for compatibility until next major bump. Originally committed as revision 19394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 18:50:49 +03:00
sha.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 17:21:45 +02:00
tree.o \
utils.o \
Reverting stray commit part II, r8156 had the base64 export patch mixed with the nutdec patch Originally committed as revision 8158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-28 05:40:23 +02:00
Clean up av_get_cpu_flag() Instead of defining functions in per-arch header files included by the main cpu.c, define them normally and call them from the generic one. Originally committed as revision 25084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-09 21:51:45 +03:00
OBJS-$(ARCH_ARM) += arm/cpu.o
OBJS-$(ARCH_PPC) += ppc/cpu.o
OBJS-$(ARCH_X86) += x86/cpu.o
Merge remote-tracking branch 'qatar/master' * qatar/master: fifo: add FIFO API test program, and fate test fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() postprocess.c: filter name needs to be double 0 terminated doxygen: fix wrong comment syntax, //< vs. ///< doxygen: drop pointless star from pointer variable names Replace deprecated av_find_stream_info() by avformat_find_stream_info(). xmv: eliminate superfluous zeroing of zero data configure: fix typo in avconv dependency list Conflicts: configure doc/APIchanges libavutil/Makefile libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-08-27 00:18:54 +03:00
fifo: add FIFO API test program, and fate test Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-16 10:49:42 +03:00
TESTPROGS = adler32 aes avstring base64 cpu crc des eval file fifo lfg lls \
Merge remote-tracking branch 'qatar/master' * qatar/master: (28 commits) mp3enc: write a xing frame containing number of frames in the file lavf: update AVStream.nb_frames when muxing. ffmpeg: remove unused variables from InputStream. doc: update ffmpeg -ar and -ac documentation to reflect reality. ffmpeg: remove pointless if (nb_input_files) ffmpeg: merge input_files_ts_offset into input_files. ffmpeg: merge input_codecs into input_streams. ffmpeg: drop AV prefixes from struct names. ffmpeg: deprecate loop_input and loop_output options gif: add loop private option. img2: add loop private option. AVOptions: in av_opt_find() don't return named constants unless unit is specified. x11grab: replace undocumented nomouse hackery with a private option. dict: extend documentation. lls: whitespace cosmetics docs: Use proper markup for a literal command line option docs: Remove a remark that isn't relevant any longer docs: Explain how to regenerate import libraries with MSVC tools docs: Mention that libraries for MSVC can be built with a cross compiler docs: Remove old docs that mention setting up a build environment with lib.exe ... Conflicts: doc/ffmpeg.texi doc/general.texi ffmpeg.c libavcodec/Makefile libavcodec/dnxhddata.c libavformat/mp3enc.c libavformat/utils.c libavutil/Makefile tests/copycooker.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 03:06:40 +03:00
md5 opt pca parseutils rational sha tree
Add a configure check for lzo1x_999_compress() and compile the lzo test program in libavutil when this function is available. Originally committed as revision 18386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-09 17:55:05 +03:00
TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
Add Makefile rules for test programs. Originally committed as revision 11643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 00:39:30 +02:00
Extend 'checkheaders' target to architecture-specific subdirectories. Originally committed as revision 16559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-12 00:48:07 +02:00
DIRS = arm bfin sh4 x86
checkheaders: skip per-arch headers not meant for direct inclusion Some of the per-arch headers are only meant to be used through the parent header of the same name. Testing these standalone does not make sense. Originally committed as revision 22341 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 22:17:47 +02:00
ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
build: include sub-makefiles using full path instead of symlinks Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 19:08:00 +03:00
include $(SRC_PATH)/subdir.mak
Move some lines in preparation for an upcoming commit. Originally committed as revision 11644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 01:27:13 +02:00
Fix lzo-test linking: -llzo2 should be in ELIBS, not EXTRALIBS. Originally committed as revision 18320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-03 01:41:58 +03:00
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
Reference in New Issue Copy Permalink