Commit Graph

69 Commits

Author SHA1 Message Date
Mans Rullgard
22aebf1bfe Add rule for compiling to asm
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>
2011-10-22 20:49:24 +02:00
Michael Niedermayer
8400607267 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: make examples build normally

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-31 00:34:47 +02:00
Luca Barbato
8a54bfe83f build: make examples build normally
The link target was missing $(EXAMPLES)
2011-07-30 13:42:44 +02:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master'
* 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 [657ccb5ac7]
  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>
2011-07-12 01:42:32 +02:00
Mans Rullgard
ca9036155d build: remove unnecessary FFLDFLAGS variable
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>
2011-07-11 11:39:04 +01:00
Michael Niedermayer
3602ad7ee6 Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'
* 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>
2011-07-11 04:23:25 +02:00
Mans Rullgard
28e1c97916 build: rework rules for things in the tools dir
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>
2011-07-10 21:13:38 +01:00
Michael Niedermayer
5d1b39f7e7 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: clean up library installation rules
  vf_drawtext: Remove some write-only variables.
  libgsm: Drop const qualifier to silence compiler warning.
  docs: Remove needless configure options
  docs: Don't recommend adding --enable-memalign-hack
  libvo-amrwbenc: Add braces to shut up gcc warning.
  adts: Fix PCE copying.

Conflicts:
	configure
	doc/general.texi
	subdir.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-08 01:05:28 +02:00
Mans Rullgard
2f138f0b7c build: clean up library installation rules
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-07 17:57:47 +01:00
Michael Niedermayer
bb9d5171a7 Merge remote-tracking branch 'qatar/master'
* 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>
2011-06-29 05:23:12 +02:00
Mans Rullgard
57b4a3dd2b build: include sub-makefiles using full path instead of symlinks
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-28 18:15:19 +01:00
Michael Niedermayer
f211d9d839 Merge remote-tracking branch 'qatar/master'
* 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>
2011-06-27 03:32:45 +02:00
Mans Rullgard
659aa20e56 build: improve rules for test programs
This generates dependencies for the *-test.o files ensuring
rebuilds when necessary.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-26 23:07:40 +01:00
Reimar Döffinger
b3ca11f07f Revert "build: Add DEP_LIBS dependency directly to the shared library build rule."
This reverts commit 729f953fb5.
2011-06-26 09:42:42 +02:00
Michael Niedermayer
4ccb7911ba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: silence some annoying armcc warnings
  ffplay: Remove unused-but-set channels variable from update_sample_display().
  build: Add DEP_LIBS dependency directly to the shared library build rule.
  build: Remove multiple inclusion guards from config.mak.
  build: Remove redundant config.mak includes from subdirectory Makefiles.
  aacenc: Mark psy_3gpp_window() as av_unused.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-26 02:31:32 +02:00
Diego Biurrun
729f953fb5 build: Add DEP_LIBS dependency directly to the shared library build rule.
The dependency was added conditional to a variable that is always defined,
so it is safe to add it directly.
2011-06-25 13:02:51 +02:00
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* 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>
2011-06-24 03:07:04 +02:00
Mans Rullgard
f038cf3c74 build: remove SRC_PATH_BARE variable
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>
2011-06-23 12:17:25 +01:00
Michael Niedermayer
87f40364d1 Merge remote-tracking branch 'qatar/master'
* 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>
2011-06-04 06:35:17 +02:00
Mans Rullgard
dc6632f119 build: simplify commands for clean target
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-06-03 19:33:32 +01:00
Carl Eugen Hoyos
d42dce7bb3 Remove avconfig.h and INCINSTDIRs on uninstall. 2011-05-24 10:09:45 +02:00
Michael Niedermayer
b1ca9642a2 Revert "Remove support for stripping executables"
People did not like this change.

This reverts commit e0be794a71.
2011-04-01 00:24:12 +02:00
Mans Rullgard
e0be794a71 Remove support for stripping executables
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>
2011-03-29 22:05:04 +01:00
Ramiro Polla
a854bcdbec fix building test programs with gnu make 3.82
Test programs may be named either %.c or %-test.c. In some cases (ie. fft),
both files exist and make has to choose which rule to use. Up to gnu make
3.81, rules were applied in definition order, in this case favouring the
generic %.c rule from common.mak. gnu make 3.82 uses a shortest stem first
order, applying definition order for same length stems. In this case,
%-test.c must come first in order for make to pick the proper source file.

Originally committed as revision 25918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 16:42:25 +00:00
Måns Rullgård
838c7c7407 Remove $(MSG) override for install-lib targets
This is no longer needed and causes incorrect output in some cases.

Originally committed as revision 22583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 14:43:05 +00:00
Måns Rullgård
0c8cc2c4d8 Reorder some make rules
I like it better this way.

Originally committed as revision 22397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:29 +00:00
Måns Rullgård
d8e117ddfe Remove superflous ifdef CONFIG_{STATIC,SHARED} in makefiles
Originally committed as revision 22396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:25 +00:00
Måns Rullgård
451db9832c Simplify static/shared build rules
Originally committed as revision 22394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:18 +00:00
Måns Rullgård
8c5239b382 Move some make rules outside of eval'd block
These rules use only global variables and thus do not need to be expanded.

Originally committed as revision 22393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:15 +00:00
Måns Rullgård
477b338266 cosmetic: move some makefile variable definitions
Originally committed as revision 22392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 14:58:11 +00:00
Måns Rullgård
2a5500b13e Add TESTOBJS make variable for extra objects used by test apps
Originally committed as revision 22335 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:44 +00:00
Måns Rullgård
09ad80855c Define HAVE_AV_CONFIG_H for checkheaders in libs
Originally committed as revision 22332 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:35 +00:00
Måns Rullgård
2f8ba7fc74 Define HAVE_AV_CONFIG_H when building test apps
Originally committed as revision 22330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:29 +00:00
Måns Rullgård
72c2bdebcf Define HAVE_AV_CONFIG_H only when building libraries
Originally committed as revision 22294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 22:18:33 +00:00
Måns Rullgård
5654067341 10l: fix make install with only shared libs
Originally committed as revision 22280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 15:46:22 +00:00
Måns Rullgård
bfca777713 Fix install with shared libs on weird systems
Originally committed as revision 22246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:45:38 +00:00
Måns Rullgård
6cfac0e908 Fix make install
Originally committed as revision 22245 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:44:18 +00:00
Måns Rullgård
63611f31e8 Prettify make output
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
2010-03-06 17:14:19 +00:00
Måns Rullgård
34512bca0e Split install-headers target and simplify rules
Originally committed as revision 22243 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:16 +00:00
Måns Rullgård
fd676deb96 Add INSTALL makefile variable
Originally committed as revision 22242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:13 +00:00
Måns Rullgård
b578357e59 Use mkdir -p to create directories
Originally committed as revision 22241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:11 +00:00
Måns Rullgård
a4aea515b0 Add YASMDEP variable; use for deps on yasm files
Originally committed as revision 22239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:14:06 +00:00
Måns Rullgård
50e10cbd7a Use $(RM) to delete files
Originally committed as revision 22234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:25:10 +00:00
Ramiro Polla
d3cb93b374 Revert r21226, it was a joke:
Get one step closer to world domination.
Remove "make uninstall".

Originally committed as revision 21466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 22:23:12 +00:00
Måns Rullgård
38d7ad1954 Use $(CC_O) in %-test.o rules
Originally committed as revision 21350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 14:14:42 +00:00
Måns Rullgård
aa310a9fc7 Add rules to install generated headers
Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 04:40:13 +00:00
Måns Rullgård
a482e61bd6 Add symbol versioning for shared libraries
Based on patch by Reinhard Tartler <siretart tauware de>

Originally committed as revision 21236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-16 04:49:02 +00:00
Ramiro Polla
93fe7eb68d Get one step closer to world domination.
Remove "make uninstall".

Originally committed as revision 21226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-15 19:16:28 +00:00
Måns Rullgård
de4070b520 Add generic rules for building helpers with HOSTCC
Originally committed as revision 20412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-29 00:55:35 +00:00
Måns Rullgård
e273b0389f Makefile cosmetics
Originally committed as revision 20410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-28 20:46:21 +00:00