summaryrefslogtreecommitdiff
path: root/Makefile
Commit message (Collapse)AuthorAge
...
* | Restore some more rules to common.mak to improve building in subdirs.Reimar Döffinger2011-06-25
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Allow running make in subdirs again.Reimar Döffinger2011-06-24
| |
* | Revert "build: move basic rules and variables to main Makefile"Reimar Döffinger2011-06-24
| | | | | | | | | | | | | | | | | | This reverts commit bb5249244ddb22df1cfb8dee1c369e6cd653d00d. This is necessary to allow running "make" in subdirs again. Conflicts: Makefile
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doxygen: Consistently use '@' instead of '\' for Doxygen markup. Use av_printf_format to check the usage of printf style functions Add av_printf_format, for marking printf style format strings and their parameters ARM: enable thumb for Cortex-M* CPUs nsvdec: Propagate error values instead of returning 0 in nsv_read_header(). build: remove SRC_PATH_BARE variable build: move basic rules and variables to main Makefile build: move special targets to end of main Makefile lavdev: improve feedback in case of invalid frame rate/size vfwcap: prefer "framerate_q" over "fps" in vfw_read_header() v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters() fbdev: prefer "framerate_q" over "fps" in device context bktr: prefer "framerate" over "fps" for grab_read_header() ALSA: implement channel layout for playback. alsa: support unsigned variants of already supported signed formats. alsa: add support for more formats. ARM: allow building in Thumb2 mode Conflicts: common.mak doc/APIchanges libavcodec/vdpau.h libavdevice/alsa-audio-common.c libavdevice/fbdev.c libavdevice/libdc1394.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: remove SRC_PATH_BARE variableMans Rullgard2011-06-23
| | | | | | | | | | | | | | | | Setting SRC_PATH to "." when building in-tree removes the need for a quoted version of the source path since out-of-tree builds are not possible if the pathname contains spaces. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: move basic rules and variables to main MakefileMans Rullgard2011-06-23
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: move special targets to end of main MakefileMans Rullgard2011-06-23
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: add --optflags option build: move documentation rules to doc/Makefile build: move test rules to tests/Makefile ac3enc: remove unneeded local variable in asym_quant() ac3enc: remove a branch in asym_quant() by doing 2 shifts ac3enc: avoid masking output in asym_quant() by using signed values for quantized mantissas. H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF H.264: fix 4:4:4 + deblocking + MBAFF H.264: fix 4:4:4 cropping warning H.264: reference the correct SPS in decode_scaling_matrices H.264: fix bug in lossless 4:4:4 decoding Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: move documentation rules to doc/MakefileMans Rullgard2011-06-22
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: move test rules to tests/MakefileMans Rullgard2011-06-22
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-14
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: move ALLFFLIBS to a more logical placeMans Rullgard2011-06-14
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-12
|\| | | | | | | | | | | | | | | * qatar/master: build: fix "make install" with documentation disabled build: simplify some conditional targets Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: fix "make install" with documentation disabledMans Rullgard2011-06-11
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: simplify some conditional targetsMans Rullgard2011-06-11
| | | | | | | | | | | | | | Use intermediate targets instead of variables for conditional parts of "all" and "install" targets. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Makefile: critical build fix after the merge. make fate passed locally due ↵Michael Niedermayer2011-06-07
| | | | | | | | | | | | to ffmpeg/ffmpeg_g being there from before Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: make rule for linking ff* apply only to these targetsMans Rullgard2011-06-07
| | | | | | | | | | | | | | This ensures that the special link command using cmdutils.o only applies to the targets it should. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: rearrange some lines in a more logical wayMans Rullgard2011-06-06
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * build: clean up .PHONY listsMans Rullgard2011-06-06
| | | | | | | | | | | | | | 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-06
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Simplify texi2html invocation through the --output option.Diego Biurrun2011-06-03
| | | | | | | | The --output option is available in texi2html since at least version 1.78.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-29
| | | | | | | | | | | | This variable is unnecessary as absolute paths are not required. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 04:41:21 +0000