summaryrefslogtreecommitdiff
path: root/common.mak
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tests: Refactor rotozoom/videogen common code into a separate file. tests: Mark some file-internal symbols as static. build: Drop leftover .exp pattern from LIBSUFFIXES list. vsrc_buffer: return EAGAIN if no frame is available. WMAL: Shift output samples by the specified number of padding zeroes. WMAL: Restore removed code in mclms_predict() rtpdec_h264: Remove a useless ifdef rtpdec_h264: Remove outdated/useless/incorrect comments rtpdec_h264: Remove useless memory corruption checks rtpdec_h264: Return proper error codes rtpdec_h264: Check the available data length before reading rtpdec_h264: Add input size checks png: check bit depth for PAL8/Y400A pixel formats. ea: check chunk_size for validity. celp filters: Do not read earlier than the start of the 'out' vector. Conflicts: libavcodec/pngdec.c libavfilter/src_buffer.c tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Drop leftover .exp pattern from LIBSUFFIXES list.Diego Biurrun2012-05-051-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: use updated reference for aac-latm_stereo_to_51 avconv: use libavresample Add libavresample FATE: avoid channel mixing in lavf-dv_fmt Conflicts: Changelog Makefile cmdutils.c configure doc/APIchanges ffmpeg.c tests/lavf-regression.sh tests/ref/lavf/dv_fmt tests/ref/seek/lavf_dv Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libxvid: remove disabled code qdm2: make a table static const qdm2: simplify bitstream reader setup for some subpacket types qdm2: use get_bits_left() build: Consistently handle conditional compilation for all optimization OBJS. avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics msrle: convert MS RLE decoding function to bytestream2. x86inc improvements for 64-bit Conflicts: common.mak libavcodec/avpacket.c libavcodec/bfi.c libavcodec/msrledec.c libavcodec/qdm2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Consistently handle conditional compilation for all optimization OBJS.Diego Biurrun2012-04-121-1/+1
| |
* | Add coverage support.Reimar Döffinger2011-12-051-1/+1
| | | | | | | | | | | | | | | | Adds --enable-coverage to configure and a "coverage-html" make target. The dependency stuff in the Makefile is a bit questionable, but the best I could think of so far. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add rule for compiling to asmMans Rullgard2011-10-221-0/+3
| | | | | | | | | | | | | | | | This allows commands of the form "make foo.s", which is useful for inspecting the compiler output for debugging purposes. Signed-off-by: Mans Rullgard <mans@mansr.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add libswresample.Michael Niedermayer2011-09-191-1/+1
| | | | | | | | | | | | | | | | | | Similar to libswscale this does resampling and format convertion, just for audio instead of video. changing sampling rate, sample formats, channel layouts and sample packing all in one with a very simple public interface. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'hexene/scratchpad'Michael Niedermayer2011-09-141-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * hexene/scratchpad: Move & Rename buildscript, remove tabs Fix regular build Support (H/W accelerated) H.264 decoding on Android via Stagefright Add build-script for Android C++ Support ;) Conflicts: Changelog Makefile configure libavcodec/Makefile libavcodec/allcodecs.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-151-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix NASM include directive dsputil_mmx: Honor HAVE_AMD3DNOW lavf,lavd: remove all usage of AVFormatParameters from demuxers. jack: add 'channels' private option. VC-1: fix reading of custom PAR. Remove redundant and dubious video codec detection by its extradata mpeg12: remove repeat-field code disabled since May 2002 patch checklist: suggest fate instead of regression tests Turn on resampling on sudden size change instead of bailing out during recode. avtools: reinitialise filter chain when input video stream changes dimensions Conflicts: Makefile avconv.c doc/developer.texi ffplay.c libavcodec/x86/dsputil_mmx.c libavdevice/libdc1394.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-211-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rv30: return AVERROR(EINVAL) instead of EINVAL build: add -L flags before existing LDFLAGS simple_idct: whitespace cosmetics simple_idct: make repeated code a macro dsputil: remove huge #if 0 block simple_idct: change 10-bit add/put stride from pixels to bytes dsputil: allow 9/10-bit functions for non-h264 codecs dnxhd: rename some data tables dnxhdenc: remove inline from function only called through pointer dnxhdenc: whitespace cosmetics swscale: mark YUV422P10(LE,BE) as supported for output configure: add -xc99 to LDFLAGS for Sun CC Remove unused and non-compiling vestigial g729 decoder Remove unused code under G729_BITEXACT #ifdef. mpegvideo: fix invalid picture unreferencing. dsputil: Remove extra blank line at end. dsputil: Replace a LONG_MAX check with HAVE_FAST_64BIT. simple_idct: add 10-bit version Conflicts: Makefile libavcodec/g729data.h libavcodec/g729dec.c libavcodec/rv30.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: changelog: misc typo and wording fixes H.264: add filter_mb_fast support for >8-bit decoding doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support. lls: use av_lfg instead of rand() in test program build: remove unnecessary dependency on libs from 'all' target H.264: avoid redundant alpha/beta calculations in loopfilter H.264: optimize intra/inter loopfilter decision mpegts: fix Continuity Counter error detection build: remove unnecessary FFLDFLAGS variable vp8/mt: flush worker thread, not application thread context, on seek. mt: proper locking around release_buffer calls. DxVA2: unbreak build after [657ccb5ac75ce34e62bd67f228d9bd36db72189e] hwaccel: unbreak build Eliminate FF_COMMON_FRAME macro. Conflicts: Changelog Makefile doc/developer.texi libavcodec/avcodec.h libavcodec/h264.c libavcodec/mpeg4videodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove unnecessary FFLDFLAGS variableMans Rullgard2011-07-111-1/+0
| | | | | | | | | | | | | | | | This variable is set to the same value for all directories. Adding the -L flags directly to LDFLAGS is simpler and achieves the same thing. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'Michael Niedermayer2011-07-111-3/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '142e76f1055de5dde44696e71a5f63f2cb11dedf': swscale: fix crash with dithering due incorrect offset calculation. matroskadec: fix stupid typo (!= -> ==) build: remove duplicates from order-only directory prerequisite list build: rework rules for things in the tools dir configure: fix --cpu=host with gcc 4.6 ARM: use const macro to define constant data in asm bitdepth: simplify FUNC/FUNCC macros dsputil: remove ff_emulated_edge_mc macro used in one place 9/10-bit: simplify clipping macros matroskadec: reindent matroskadec: defer parsing of cues element until we seek. lavc: add support for codec-specific defaults. lavc: make avcodec_alloc_context3 officially public. lavc: remove a half-working attempt at different defaults for audio/video codecs. ac3dec: add a drc_scale private option lavf: add avformat_find_stream_info() lavc: introduce avcodec_open2() as a replacement for avcodec_open(). Conflicts: Makefile libavcodec/utils.c libavformat/avformat.h libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove duplicates from order-only directory prerequisite listDiego Biurrun2011-07-101-3/+3
| | | | | | | | | | This reduces startup latency for make invocations, which is especially noticeable on systems that are slow or have slow I/O, like Windows.
| * build: rework rules for things in the tools dirMans Rullgard2011-07-101-0/+6
| | | | | | | | | | | | | | | | Declaring tools associated with each library in their respective makefiles allows these tools to easily depend on the correct prerequisites and link against the libs they need. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-301-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rational-test: Add proper main() declaration to fix gcc warnings. configure: Add vdpau and dxva2 to configure results output. Remove unused, never built libavutil/pca.[ch] matroskadec: forward parsing errors to caller. av_find_stream_info: simplify EAGAIN handling. aacenc: Fix determination of Mid/Side Mode. psymodel: Remove the single channel analysis function aacenc: Implement dummy channel group analysis that just calls the single channel analysis for each channel. psymodel: Add channels and channel groups to the psymodel. ARM: remove check for PLD instruction fate: move amr[nw]b test rules into separate files ogg: fix double free when finding length of small chained oggs. swscale: implement >8bit scaling support. build: fix creation of tools dir with make 3.81 build: Mark all-yes Makefile target as phony. pixfmt: fix YUV422/444 wrong endian comment build: create output directories as needed Add new yuv444 pixfmts to avcodec_align_dimensions2 Conflicts: Makefile configure libavutil/pca.c libavutil/pca.h libavutil/pixfmt.h libswscale/swscale.c libswscale/utils.c libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: create output directories as neededMans Rullgard2011-06-291-0/+6
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Move SRC_PATH hack around to allow compilation from subdir again.Reimar Döffinger2011-06-301-6/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-291-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) swscale: Add Doxygen for hyscale_fast/hScale. fate: enable lavfi-pixmt tests on big endian systems PPC: swscale: disable altivec functions for unsupported formats fate: merge identical pixdesc_be/le tests swscale: Add Doxygen for yuv2planar*/yuv2packed* functions. build: call texi2pod.pl with full path instead of symlink build: include sub-makefiles using full path instead of symlinks swscale: update big endian reference values after dff5a835. wavpack: skip blocks with no samples cosmetics: remove outdated comment that is no longer true build: replace some addprefix/addsuffix with substitution refs avutil: Remove unused arbitrary precision integer code. configure: Drop check for availability of ten assembler operands. aacenc: Save channel configuration for later use. aacenc: Fix codebook trellising for zeroed bands. swscale: change prototypes of scaled YUV output functions. swscale: re-add support for non-native endianness. swscale: disentangle yuv2rgbX_c_full() into small functions. swscale: split yuv2packed[12X]_c() remainders into small functions. swscale: split yuv2packedX_altivec in smaller functions. ... Conflicts: Makefile configure libavcodec/x86/dsputil_mmx.c libavfilter/Makefile libavformat/Makefile libavutil/integer.c libavutil/integer.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/x86/swscale_template.c tests/ref/lavfi/pixdesc_le tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: replace some addprefix/addsuffix with substitution refsMans Rullgard2011-06-281-10/+10
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-271-9/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: improve rules for test programs build: factor out the .c and .S compile commands as a macro swscale: remove unused xInc/srcW arguments from hScale(). H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit H.264: make filter_mb_fast support 4:4:4 mpeg4videoenc: Remove disabled variant of mpeg4_encode_block(). configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag. Move some variable declarations below the proper #ifdefs. Conflicts: Makefile ffplay.c libswscale/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation in subdir with NASM.Reimar Döffinger2011-06-251-1/+2
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Restore some more rules to common.mak to improve building in subdirs.Reimar Döffinger2011-06-251-0/+10
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Restore accidentally removed parts of "BRIEF" list.Reimar Döffinger2011-06-241-1/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Allow running make in subdirs again.Reimar Döffinger2011-06-241-0/+6
| |
* | Revert "build: move basic rules and variables to main Makefile"Reimar Döffinger2011-06-241-0/+40
|/ | | | | | | | | This reverts commit bb5249244ddb22df1cfb8dee1c369e6cd653d00d. This is necessary to allow running "make" in subdirs again. Conflicts: Makefile
* build: move basic rules and variables to main MakefileMans Rullgard2011-06-231-40/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: move special targets to end of main MakefileMans Rullgard2011-06-231-8/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: move vpath directives to main MakefileMans Rullgard2011-06-141-5/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: move ALLFFLIBS to a more logical placeMans Rullgard2011-06-141-2/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: remove empty $(OBJS) targetMans Rullgard2011-06-071-2/+0
| | | | | | | | This target was added to prevent some files being deleted by make when using chains of implicit rules. This is no longer required. Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: clean up .PHONY listsMans Rullgard2011-06-061-2/+0
| | | | | | | This removes nonexisting targets from phony lists and puts them all in one place. Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: move all (un)install* target aliases to toplevel MakefileMans Rullgard2011-06-061-5/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: remove stale dependencyMans Rullgard2011-06-061-2/+0
| | | | | | This dependency is implicitly covered elsewhere. Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: do not add CFLAGS-yes to CFLAGSMans Rullgard2011-06-061-1/+0
| | | | | | CFLAGS-yes is never set so this serves no purpose. Signed-off-by: Mans Rullgard <mans@mansr.com>
* build: remove BUILD_ROOT variableMans Rullgard2011-05-291-9/+3
| | | | | | This variable is unnecessary as absolute paths are not required. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Include dependencies for test programsMans Rullgard2011-03-311-2/+2
| | | | | | | This makes sure the various *-test programs are correctly rebuilt when necessary. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Remove support for stripping executablesMans Rullgard2011-03-291-1/+1
| | | | | | | | Stripping is generally best left to package management tools, and since unstripped copies are kept in the build tree, any arguments about saving space (no matter how insignificant) are void. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | 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>
* Create config.asm for use with yasmMåns Rullgård2010-09-031-0/+1
| | | | Originally committed as revision 25039 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove dep/depend targets and related variables.Diego Biurrun2010-08-171-4/+1
| | | | | | We no longer create dependency files directly, so the rules are now pointless. Originally committed as revision 24807 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add libavcore.Stefano Sabatini2010-07-211-1/+1
| | | | | | | | | | | The new library is meant to contain the core multimedia utilities for FFmpeg, to make them shareable between more libav* libraries. See thread: Subject: [FFmpeg-devel] [RFC] New library for shared non-generic libav* utils Date: Fri, 9 Jul 2010 01:07:40 +0200 Originally committed as revision 24393 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Stop make complaining about moved/deleted headersMåns Rullgård2010-07-041-0/+4
| | | | Originally committed as revision 24041 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add -I flags to HOSTCFLAGSMåns Rullgård2010-06-261-1/+4
| | | | Originally committed as revision 23805 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix brief make messages when CC etc are specified on command lineMåns Rullgård2010-06-261-2/+2
| | | | Originally committed as revision 23792 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ranlib silent in brief output modeMåns Rullgård2010-03-171-2/+2
| | | | | | Running ranlib is quick and uninteresting, no need to print it. Originally committed as revision 22582 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix brief make output for generated tablesMåns Rullgård2010-03-141-2/+2
| | | | Originally committed as revision 22526 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove .SECONDARY directiveMåns Rullgård2010-03-101-1/+1
| | | | | | | | | The presence of the .SECONDARY directive caused thing to not always be correctly rebuilt. Mentioning the object files explicitly as targets gives the desired result of make not deleting them without unpleasant side-effects. Originally committed as revision 22422 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Improve version.h generationMåns Rullgård2010-03-101-8/+0
| | | | | | | | | | | Force version.sh to run whenever the version might have changed, regardless of what is being built. This is done by attaching the dependencies to a dummy file (.version) which is included from the makefile. As make will always attempt to rebuild any included files before considering other rules, this ensures that the real version.h is (re-)created before it is required by any source file. Originally committed as revision 22420 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status