summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Remove generated .version file on distclean.Diego Biurrun2011-05-26
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. Conflicts: libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/dca.c libavcodec/h264.c libavcodec/mdec.c libavcodec/mpeg12.c libavcodec/options.c libavcodec/version.h libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unused make variable SEEK_REFFILEMans Rullgard2011-05-18
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: remove redundant aref and vref referencesMans Rullgard2011-05-18
| | | | | | | | | | | | | | | | | | The ref targets are included in the FATE_[AV]CODEC lists created by configure so they do not need to be listed separately in the makefile. Filter them out when setting dependencies to avoid make warnings about circular deps. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fate: run aref and vref as regular testsMans Rullgard2011-05-18
| | | | | | | | | | | | | | | | | | These tests create reference files used for psnr calculation in the other codec tests. Treating them as (mostly) regular tests simplifies the makefile and makes them visible in the fate reports. The latter makes errors in these runs easier to identify. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Makefile:Put lost tab back.Michael Niedermayer2011-05-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: mention fate documentation in the error messageFrancesco Cosoleto2011-05-06
| | | | | | | | | | Signed-off-by: Francesco Cosoleto <cosoleto@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-04
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Implement fate-rsync target Make ffmpeg support generic data stream Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Implement fate-rsync targetReinhard Tartler2011-05-03
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIChanges: document git revision for CODEC_CAP_SLICE_THREADS addition. Introduce slice threads flag. FATE: allow forcing thread-type when doing threaded fate runs. Use av_log_ask_for_sample() where appropriate. error: sort, pack, and align error code and string definitions The stabilization period after version bumps should be one month, not one week. applehttp: Expose the stream bitrate via metadata doc: Add some initial docs on the applehttp demuxer Provide a fallback version of the libm function trunc libavdevice: Define _XOPEN_SOURCE for usleep lavc: provide deprecated avcodec_thread_init until next major version lavc: provide the opt.h header until the next bump error: change AVERROR_EOF value error: remove AVERROR_NUMEXPECTED error: add error code AVERROR_OPTION_NOT_FOUND, and use it in opt.c Conflicts: libavcodec/h264.c libavutil/error.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * FATE: allow forcing thread-type when doing threaded fate runs.Ronald S. Bultje2011-04-21
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Makefile: Include dependencies for test tools, too Remove a version check in av_log made unnecessary by the big bump. update last major version increase dates in APIchanges Reduce picture size for yadif. oggdec: use av_freep() instead of av_free() avio: Fix sanity checks in ffurl_read* libavformat: Free AVFormatContext->streams libavformat: Make protocols pass URLContext as log context where available asf: remove commented out code in asf_read_seek not pulled: libpostproc: Remove crufty code disabled by the big bump. Reflect 0.7_beta1 release in the Changelog not pulled: sws: remove disabled cruft. lavu: remove disabled ff_random_get_seed cruft. lavu: remove disabled sha1 cruft. Conflicts: Changelog libavutil/sha1.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Makefile: Include dependencies for test tools, tooMartin Storsjö2011-04-20
| | | | | | | | | | | | | | | | | | This makes seek_test to be rebuilt when its dependencies has changed. The changes to the dependencies didn't usually matter in practice, but the introduction of side data in AVPacket required a recompilation. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Drop checkheaders from check, its uselessMichael Niedermayer2011-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Remove support for stripping executables"Michael Niedermayer2011-04-01
| | | | | | | | | | | | People did not like this change. This reverts commit e0be794a71be25a350f68287ee291b4942bcb7d8.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: ac3enc: move compute_mantissa_size() to ac3dsp ac3enc: move mant*_cnt and qmant*_ptr out of AC3EncodeContext Remove support for stripping executables ac3enc: NEON optimised float_to_fixed24 ac3: move ff_ac3_bit_alloc_calc_bap to ac3dsp dfa: protect pointer range checks against overflows. Duplicate: mimic: implement multithreading. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove support for stripping executablesMans Rullgard2011-03-29
| | | | | | | | | | | | | | | | 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 remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: avio: make udp_set_remote_url/get_local_port internal. asfdec: also subtract preroll when reading simple index object matroskaenc: remove a variable that's unused after bc17bd9. avio: cosmetics - nicer vertical alignment. Remove unnecessary icc version checks Disable 'attribute "foo" ignored' warnings from icc rtsp: Don't use a locale dependent format string Add xd55 codec tag for XDCAM HD422 720p25 CBR files. configure: get libavcodec version from new version.h header lavc: move the version macros to a new installed header. matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config Do not use format string "%0.3f" for RTSP Range field. Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder. Document usage of import libraries created by dlltool configure: Set the correct lib target for arm/wince dlltool fate: simplify regression-funcs.sh fate: add support for multithread testing Conflicts: libavformat/rtspdec.c libavutil/attributes.h libavutil/internal.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fate: add support for multithread testingLuca Barbato2011-03-23
| | | | | | | | Add a THREADS variable to fate calls.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at> Not Pulled: commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2 Author: Mans Rullgard <mans@mansr.com> Date: Mon Feb 28 18:06:58 2011 +0000 Remove Sonic experimental audio codec commit 2912e87a6c9264d556734e2bf94a99c64cf9b102 Author: Mans Rullgard <mans@mansr.com> Date: Fri Mar 18 17:35:10 2011 +0000 Replace FFmpeg with Libav in licence headers
| * get rid of the last svn mentionsJanne Grunau2011-03-18
| |
* | Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer2011-03-17
|/ | | | This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
* replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau2011-03-16
| | | | also update the multiple inclusion guards in config.h|mak
* Makefile: include deps from tools directoryMans Rullgard2011-02-20
| | | | | | | | This ensures the tools are rebuilt when necessary. Specifically, lavfi-showfiltfmts was sometimes not rebuilt causing spurious test failures. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | 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>
* Allow "make clean" to clean files in toolsStefano Sabatini2011-02-12
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Add lavfi-showfiltfmts and graph2dot to $(TOOLS)Stefano Sabatini2011-02-12
| | | | | | | | Allow make clean to remove the corresponding binaries. Fix issue 2162. Signed-off-by: Mans Rullgard <mans@mansr.com>
* VP8: ARM optimised decode_block_coeffs_internalMans Rullgard2011-02-11
| | | | | | Approximately 5% faster on Cortex-A8. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Makefile: remove unused variable ALLHTMLPAGESMans Rullgard2011-02-01
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Makefile: build docs only for enabled tools; fix docs dependenciesMans Rullgard2011-02-01
| | | | | | | | This makes "make documentation" build the man/html pages only for the tools enabled in the build. It also fixes the dependency tracking for the built man pages. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Auto-generate dependencies for documentationMans Rullgard2011-02-01
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* doc: modify style for texi2html 1.78+Janne Grunau2011-01-29
| | | | | | | | | | | | The generated HTML files are similar to the ones generated with texi2html 1.56k used on the website. Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended version. The removed @sp from the titlepage section were ignored until texi2html 5.0. If not removed the pages generated by 5.0 will have ugly empty space around the title.
* Makefile: fix cleaning of tools in tests directoryMans Rullgard2011-01-25
| | | | | | | The variable TESTPROGS is reset by the library makefiles, use another name. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Fix ALLPROGS_G so that *_g binaries get cleaned properlyDaniel Verkamp2011-01-25
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Makefile: simplify test tools handlingMans Rullgard2011-01-23
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Makefile: simplify setting of some variablesMans Rullgard2011-01-21
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Add demuxers.texi file.Stefano Sabatini2011-01-09
| | | | Originally committed as revision 26282 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Metadata muxerAnton Khirnov2010-12-27
| | | | | | Dumps all metadata to a text file for easy manual editing. Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add dependency for the libavfitler.html file.Stefano Sabatini2010-12-23
| | | | Originally committed as revision 26078 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify texi files naming: ff*-doc.texi -> ff*.texi.Stefano Sabatini2010-12-14
| | | | Originally committed as revision 26006 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define PODPAGES in Makefile, and make them depend onStefano Sabatini2010-12-11
| | | | | | | | fftools-common-opts.texi. Fix pod files updating when fftools-common-opts.texi is changed. Originally committed as revision 25928 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix building of object files in tools/Ramiro Polla2010-12-07
| | | | | | Fixes issue issue2408. Originally committed as revision 25905 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a file for bitstream filters documentation.Stefano Sabatini2010-11-08
| | | | | | | Based on a patch by Nicolas George <@var{name}.@var{surname}@@normalesup.@code{org}>. Originally committed as revision 25709 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add eval.texi file.Stefano Sabatini2010-11-03
| | | | Originally committed as revision 25665 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fate: print list of tests with "make fate-list"Måns Rullgård2010-08-26
| | | | Originally committed as revision 24947 to svn://svn.ffmpeg.org/ffmpeg/trunk
* MP3 float decoder FATE testsVitor Sessak2010-08-23
| | | | Originally committed as revision 24880 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fate: remove pointless fate/fate2 separationMåns Rullgård2010-08-22
| | | | Originally committed as revision 24868 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Skip adding SDL_CFLAGS to CFLAGS for the ffplay.d target.Diego Biurrun2010-08-17
| | | | | | We no longer create .d files directly, so the rule is pointless. Originally committed as revision 24805 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fate: move some groups of related tests to their own filesMåns Rullgård2010-08-04
| | | | | | | This moves some groups of tests for single codecs to separate files, and adds shorthands for running all tests in a group. Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk