summaryrefslogtreecommitdiff
path: root/common.mak
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-151-7/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: remove misplaced comment. ffmpeg: fix streaming to ffserver. swscale: split out RGB48 output functions from yuv2packed[12X]_c(). build: move vpath directives to main Makefile swscale: fix JPEG-range YUV scaling artifacts. build: move ALLFFLIBS to a more logical place ARM: factor some repetitive code into macros Fix SVQ3 after adding 4:4:4 H.264 support H.264: fix CODEC_FLAG_GRAY 4:4:4 H.264 decoding support ac3enc: fix allocation of floating point samples. Conflicts: ffmpeg.c libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/snow.c libswscale/swscale.c libswscale/swscale_internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
* | Revert "build: remove empty $(OBJS) target"Michael Niedermayer2011-06-081-0/+2
| | | | | | | | | | This reverts commit b9c6c7cb25932b594fd684a0cb553e439d49fe12. It appears this caused the .o files to be deletec under some circumstances.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-071-12/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: build: remove empty $(OBJS) target build: make rule for linking ff* apply only to these targets build: rearrange some lines in a more logical way s302m: fix resampling for 16 and 24bits. ARM: remove MUL64 and MAC64 inline asm build: clean up .PHONY lists build: move all (un)install* target aliases to toplevel Makefile flvenc: propagate error properly build: remove stale dependency build: do not add CFLAGS-yes to CFLAGS utils.c: fix crash with threading enabled. configure: simplify source_path setup configure: remove --source-path option lavf: deprecate AVFormatParameters.time_base. img2: add framerate private option. img2: add video_size private option. img2: add pixel_format private option. tty: add framerate private option. Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-301-9/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ARM: enable UAL syntax in asm.S v4l2: don't leak video standard string on error. swscale: Remove disabled code. avfilter: Surround function only used in debug mode by appropriate #ifdef. vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog(). build: remove BUILD_ROOT variable vp8: use av_clip_uintp2() where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-04-011-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * newdev/master: mpegts: propagate avio EOF in read_packet() configure: Initial support for --target-os=symbian Fixed-point FFT and MDCT Include dependencies for test programs ac3enc: simplify sym_quant() flvdec: read index stored in the 'keyframes' tag. mov: Add support for zero-sized stsc runs. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
* | Revert "Remove support for stripping executables"Michael Niedermayer2011-04-011-1/+1
|/ | | | | | People did not like this change. This reverts commit e0be794a71be25a350f68287ee291b4942bcb7d8.
* 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
* Replace $(G) with more generic $(M) in silent make rulesMåns Rullgård2010-03-101-2/+3
| | | | Originally committed as revision 22419 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prettify make output for documentationMåns Rullgård2010-03-101-0/+1
| | | | Originally committed as revision 22418 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prettify make output when generating headersMåns Rullgård2010-03-091-1/+2
| | | | Originally committed as revision 22401 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify static/shared build rulesMåns Rullgård2010-03-091-1/+3
| | | | Originally committed as revision 22394 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove duplicates from OBJSMåns Rullgård2010-03-091-1/+1
| | | | Originally committed as revision 22391 to svn://svn.ffmpeg.org/ffmpeg/trunk
* checkheaders: skip per-arch headers not meant for direct inclusionMåns Rullgård2010-03-081-0/+1
| | | | | | | | 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
* Add TESTOBJS make variable for extra objects used by test appsMåns Rullgård2010-03-081-0/+1
| | | | Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Skip cmdutils_common_opts.h fragment in checkheadersMåns Rullgård2010-03-081-1/+1
| | | | Originally committed as revision 22333 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define HAVE_AV_CONFIG_H only when building librariesMåns Rullgård2010-03-071-1/+1
| | | | Originally committed as revision 22294 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix build with compilers using a separate dependency commandMåns Rullgård2010-03-061-1/+1
| | | | Originally committed as revision 22249 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prettify make outputMåns Rullgård2010-03-061-1/+13
| | | | | | | This gives brief messages from make by default. For full command echoing, add V=1 to make command line. Originally committed as revision 22244 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Stop make deleting intermediate files (ffmpeg.o and friends)Måns Rullgård2010-02-271-0/+3
| | | | Originally committed as revision 22094 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Disable suffix rulesMåns Rullgård2010-02-251-0/+4
| | | | | | | | Most of the make builtin rules, which we do not need, are suffix rules, and we use only new-style pattern rules. Disabling suffix rules saves some time when building on slow systems. Originally committed as revision 22064 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ECFLAGS so it doesn't get added multiple timesMåns Rullgård2010-01-281-1/+2
| | | | Originally committed as revision 21520 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Append ECFLAGS to CFLAGSMåns Rullgård2010-01-281-1/+1
| | | | | | | This makes it easy to supply extra flags on the make command line for testing purposes. Originally committed as revision 21515 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Revert r21226, it was a joke:Ramiro Polla2010-01-261-1/+3
| | | | | | | Get one step closer to world domination. Remove "make uninstall". Originally committed as revision 21466 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add symbol versioning for shared librariesMåns Rullgård2010-01-161-1/+5
| | | | | | Based on patch by Reinhard Tartler <siretart tauware de> Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get one step closer to world domination.Ramiro Polla2010-01-151-3/+1
| | | | | | Remove "make uninstall". Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Delete *.d files with make cleanMåns Rullgård2009-11-221-2/+2
| | | | Originally committed as revision 20577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add generic rules for building helpers with HOSTCCMåns Rullgård2009-10-291-0/+8
| | | | Originally committed as revision 20412 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add PIC flags early so tests they affect give correct resultsMåns Rullgård2009-08-231-3/+3
| | | | | | This is mainly the checks for ebx on x86, but possibly others too. Originally committed as revision 19687 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Skip headers requiring external libs not present in checkheadersMåns Rullgård2009-08-231-1/+2
| | | | Originally committed as revision 19685 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Generate dependencies while compiling if supported by compilerMåns Rullgård2009-08-081-4/+4
| | | | Originally committed as revision 19609 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status