generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1822aee7e6
ffmpeg/libavutil/Makefile

132 lines
8.4 KiB
Makefile
Raw Normal View History

Revert "build: Remove redundant config.mak includes from subdirectory Makefiles." This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
2011-06-26 09:46:05 +02: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 15:39:43 +01: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-20 23:53:18 +01: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 15:19:23 +02: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 22:28:56 +01:00
attributes.h \
avutil: add audio fifo buffer The functions operate on the sample level rather than the byte level and work with all audio sample formats.
2012-03-23 22:45:48 +01:00
audio_fifo.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 14:37:08 +01: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 15:55:13 +02: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-20 23:53:18 +01:00
avstring.h \
avutil.h \
base64.h \
Add Blowfish encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:45:27 +02:00
blowfish.h \
lavu: add av_bprintf and related.
2012-02-01 20:37:50 +01:00
bprint.h \
Install bswap.h and intreadwrite.h Originally committed as revision 24174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 00:22:07 +02: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-20 23:53:18 +01: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 11:59:08 +02: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-20 23:53:18 +01: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 10:43:24 +01: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 14:01:28 +02: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-20 23:53:18 +01: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 15:13:04 +01: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 14:37:08 +01:00
imgutils.h \
avutil: make intfloat api public The functions are already av_ prefixed and intfloat header is already provided. Install libavutil/intfloat.h Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2012-01-29 21:09:22 +01:00
intfloat.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 23:53:18 +01: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 00:22:07 +02:00
intreadwrite.h \
avutil: install lfg.h Originally committed as revision 23985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 14:12:06 +02: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-20 23:53:18 +01: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 12:45:00 +02: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 01:42:25 +02: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 14:37:08 +01:00
parseutils.h \
Make the pixdesc API public. Originally committed as revision 20603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 00:33:41 +01: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 15:27:50 +01: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 10:53:40 +02: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-20 23:53:18 +01: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 14:37:08 +01: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 15:19:23 +02:00
sha.h \
Move av_gettime() to libavutil Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-20 02:24:39 +02:00
time.h \
lavu: add public timecode API.
2012-01-16 11:20:46 +01:00
timecode.h \
lavu: add timestamp.h header with convenience timestamp utilities
2012-01-17 17:12:42 +01:00
timestamp.h \
Install libavutil/version.h Fixes ticket #1513
2012-07-05 08:21:49 +02:00
version.h \
Add XTEA encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:53:16 +02:00
xtea.h \
cosmetics: Consistently place HEADERS before OBJS in all Makefiles. Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 23:53:18 +01:00
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
ARCH_HEADERS = bswap.h \
intmath.h \
intreadwrite.h \
timer.h \
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 05:40:16 +01: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 16:21:45 +01:00
OBJS = adler32.o \
aes.o \
avutil: add audio fifo buffer The functions operate on the sample level rather than the byte level and work with all audio sample formats.
2012-03-23 22:45:48 +01:00
audio_fifo.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 14:37:08 +01: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-29 23:12:36 +01:00
avstring.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01:00
base64.o \
Add Blowfish encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:45:27 +02:00
blowfish.o \
lavu: add av_bprintf and related.
2012-02-01 20:37:50 +01:00
bprint.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 17:07:14 +02:00
cpu.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01:00
crc.o \
des.o \
Implement av_strerror(). Originally committed as revision 22684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-25 23:46:35 +01: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 14:01:28 +02:00
eval.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01: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 15:13:04 +01:00
file.o \
Add a float DSP framework to libavutil Move vector_fmul() from DSPContext to AVFloatDSPContext.
2012-05-21 18:58:41 +02:00
float_dsp.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 14:37:08 +01:00
imgutils.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01: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 14:37:37 +02:00
inverse.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01: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 12:45:00 +02:00
dict.o \
Move AVOptions from libavcodec to libavutil Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 16:25:22 +02: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 14:37:08 +01:00
parseutils.o \
Make the pixdesc API public. Originally committed as revision 20603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-25 00:33:41 +01: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 02:28:14 +01:00
random_seed.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01: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 14:37:08 +01: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 17:50:49 +02:00
sha.o \
Move av_gettime() to libavutil Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-06-20 02:24:39 +02:00
time.o \
lavu: add public timecode API.
2012-01-16 11:20:46 +01:00
timecode.o \
cosmetic: align backslashes in makefiles Originally committed as revision 15717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 16:21:45 +01:00
tree.o \
utils.o \
Move xGA font data from lavc to lavu. This needs to be accessible for libavfilter in the next commit.
2012-09-22 09:56:33 +02:00
xga_font_data.o \
Add XTEA encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:53:16 +02:00
xtea.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 04:40:23 +01:00
MinGW: Use our snprintf/vsnprintf when MinGW's is broken All versions of MinGW-w64 prior to version 3, as well as all versions of MinGW32 have broken implementations of vsnprintf. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-09-25 00:44:20 +02:00
OBJS-$(HAVE_BROKEN_SNPRINTF) += ../compat/msvcrt/snprintf.o
OBJS-$(HAVE_MSVCRT) += ../compat/strtod.o
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime. Signed-off-by: Martin Storsjö <martin@martin.st>
2012-09-04 15:30:37 +02:00
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
TESTPROGS = adler32 \
aes \
avstring \
base64 \
Add Blowfish encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:45:27 +02:00
blowfish \
Merge remote-tracking branch 'qatar/master' * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:42:41 +02:00
bprint \
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
cpu \
crc \
des \
lavu/error: use a table to store error codes and strings, add test The table is mostly useful to enumerate the available AVERROR* in the test output.
2012-02-06 14:16:33 +01:00
error \
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
eval \
Merge remote-tracking branch 'qatar/master' * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:42:41 +02:00
file \
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
fifo \
lfg \
lls \
md5 \
opt \
Merge remote-tracking branch 'qatar/master' * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:42:41 +02:00
pca \
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
parseutils \
Merge remote-tracking branch 'qatar/master' * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:42:41 +02:00
random_seed \
rational \
build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line.
2012-04-14 13:05:08 +02:00
sha \
tree \
Add XTEA encryption support in libavutil Signed-off-by: Martin Storsjö <martin@martin.st>
2012-07-03 15:53:16 +02:00
xtea \
Merge remote-tracking branch 'qatar/master' * qatar/master: libschroedinger: Switch to function names more in line with Libav style. Move code shared between libdirac and libschroedinger to libschroedinger. lavfi: uninline avfilter_copy_buffer_ref_props(). lavf: add missing '*' in a doxy. h264: Remove a commented-out function pointer typedef. txd: Remove write-only variable in txd_decode_frame(). mmvideo.c: Remove unused variable in mm_decode_pal(). build: cosmetics: Add missing end-of-line backslashes to item lists. build: cosmetics: Split HEADERS/OBJS/PROGS lists into one entry per line. libschroedinger: Move a function to avoid a forward declaration. pthread: warn on high thread counts vf_yadif: fix missing error handling for avfilter_poll_frame() avprobe: allow showing only one container/stream property. lavfi: support audio in avfilter_copy_frame_props(). lavfi: avfilter_merge_formats: handle case where inputs are same lavc: add sample rate and channel layout to AVFrame. zerocodec: check if the previous frame is missing doc: clarify check for NULL pointer style Conflicts: doc/APIchanges doc/developer.texi ffprobe.c libavcodec/Makefile libavcodec/avcodec.h libavcodec/libdirac_libschro.c libavcodec/libdirac_libschro.h libavcodec/mmvideo.c libavcodec/txd.c libavcodec/version.h libavcodec/zerocodec.c libavfilter/Makefile libavfilter/avfilter.c libavfilter/version.h libavformat/Makefile libavutil/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-07 22:42:41 +02:00
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 16:55:05 +02: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-27 23:39:30 +01:00
tools: add ffeval tool The tool is useful for testing the internal arithmetic evaluation engine (indeed I plan to use it in FATE), and provides a handy calculator when you can't rely on bc ;-).
2012-01-15 23:05:07 +01:00
TOOLS = ffeval
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 00:41:58 +02:00
$(SUBDIR)lzo-test$(EXESUF): ELIBS = -llzo2
Reference in New Issue Copy Permalink