1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

44 Commits

Author SHA1 Message Date
Timo Rothenpieler
b77fff47d0 configure: always enable gnu_windres if available
Use the appropiate Makefile variable to ensure the resource file is
only built into shared libraries instead.
2022-08-13 14:42:36 +02:00
Andreas Rheinhardt
f2b79c5b85 lib*/version: Move library version functions into files of their own
This avoids having to rebuild big files every time FFMPEG_VERSION
changes (which it does with every commit).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-05-10 06:49:32 +02:00
Martin Storsjö
0f8b0b9ce2 libpostproc: Split version.h
Signed-off-by: Martin Storsjö <martin@martin.st>
2022-03-16 14:05:26 +02:00
James Almer
6fdd35a312 Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
* commit '92db5083077a8b0f8e1050507671b456fd155125':
  build: Generate pkg-config files from Make and not from configure
  build: Store library version numbers in .version files

Includes cherry-picked commits 8a34f36593 and
ee164727dd to fix issues.

Changes were also made to retain support for raise_major and build_suffix.

Reviewed-by: ubitux
Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 19:59:30 -03:00
Clément Bœsch
3f17751eeb Merge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '11a9320de54759340531177c9f2b1e31e6112cc2':
  build: Move build-system-related helper files to a separate subdirectory

"ffbuild" directory name is used instead of "avbuild".

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-03 16:49:12 +02:00
James Almer
56572787ae Add Windows resource file support for shared libraries
Originally written by James Almer <jamrial@gmail.com>

With the following contributions by Timothy Gu <timothygu99@gmail.com>

* Use descriptions of libraries from the pkg-config file generation function
* Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser)
* Use "FFmpeg" for ProductName as MSDN says "name of the product with which the
  file is distributed" [1].
* Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1].
* Only build the .rc files when --enable-small is not enabled.

[1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05 23:42:07 +01:00
jamal
ec87389183 postproc: Create version.h header
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-28 15:06:26 +02:00
Michael Niedermayer
3ba0bfe71f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ulti: Fix invalid reads
  lavf: dealloc private options in av_write_trailer
  yadif: support 10bit YUV
  vc1: mark with ER_MB_ERROR bits overconsumption
  lavc: introduce ER_MB_END and ER_MB_ERROR
  error_resilience: use the ER_ namespace
  build: move inclusion of subdir.mak to main subdir loop
  rv34: NEON optimised 4x4 dequant
  rv34: move 4x4 dequant to RV34DSPContext
  aacdec: Use intfloat.h rather than local punning union.

Conflicts:
	libavcodec/h264.c
	libavcodec/vc1dec.c
	libavfilter/vf_yadif.c
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 23:21:37 +01:00
Mans Rullgard
878dda5db1 build: move inclusion of subdir.mak to main subdir loop
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-12-13 14:26:49 +00: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
Reimar Döffinger
1109680434 Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
This reverts commit a6213f3dce.
2011-06-26 09:49:36 +02:00
Diego Biurrun
a6213f3dce build: Remove redundant config.mak includes from subdirectory Makefiles.
Calling Make from subdirectories is not supported and config.mak has
multiple inclusion guards anyway, so the top-level include is enough.
2011-06-25 13:02:51 +02:00
Måns Rullgård
71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
Diego Biurrun
0050adee97 cosmetics: Remove useless empty line.
Originally committed as revision 12365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:54:15 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:39:43 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +00:00
Måns Rullgård
76a448ed4f Install headers in $prefix/include/$libname
Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 09:22:11 +00:00
Diego Pettenò
363728ea0e Build both static and shared libs from the same object.
This makes libpostproc consistent with all the other libraries.
patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

Originally committed as revision 11526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-14 14:42:29 +00:00
Diego Biurrun
582c1c47da Declare libpostproc prerequisites directly instead of using a layer of
indirection. This moves build system workarounds closer to libpostproc
where they are really needed.

Originally committed as revision 10874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-30 07:54:18 +00:00
Diego Biurrun
021551c587 Uppercase variable overlooked in last commit.
Originally committed as revision 9777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-21 18:56:53 +00:00
Diego Biurrun
fa62bdb868 Move libpostproc-specific uninstallation command to the libpostproc Makefile.
Originally committed as revision 9277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-10 21:29:56 +00:00
Diego Biurrun
3cee76e6c9 Remove useless conditional.
Originally committed as revision 8139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 00:18:38 +00:00
Måns Rullgård
997baf0141 allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath

Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 00:02:15 +00:00
Diego Biurrun
5423fe7391 Fix dependencies for 'make dep'.
Originally committed as revision 6835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-29 16:53:30 +00:00
Diego Biurrun
14f29f795d Revert putting EXTRALIBS in common.mak, linking fails on MinGW.
Originally committed as revision 6700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-15 12:59:45 +00:00
Diego Biurrun
dadb850a50 Move CFLAGS handling to common.mak.
Originally committed as revision 6642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 08:30:13 +00:00
Diego Biurrun
cbeee4d8e5 Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 09:22:44 +00:00
Diego Biurrun
4aad0d6db6 Remove bogus commented out include line.
Originally committed as revision 6571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 08:38:55 +00:00
Diego Biurrun
0533322ea3 Move EXTRALIBS handling to common.mak.
Originally committed as revision 6545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 19:23:39 +00:00
Luca Barbato
17ff55356a Fix postproc build, thanks to Pavlov Konstantin <thresh@cpms.ru>
Originally committed as revision 6534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-03 07:57:04 +00:00
Luca Barbato
6ab6c7c3cc make postproc use avutil
Originally committed as revision 6524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-02 10:49:27 +00:00
Diego Biurrun
dc8cd49f1a Remove superfluous ifeq.
Originally committed as revision 6239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-12 10:50:32 +00:00
Diego Biurrun
691c480e7f Fix 'make depend' for libpostproc.
Originally committed as revision 6238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-12 10:33:27 +00:00
Diego Biurrun
7981555d89 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.

Originally committed as revision 6016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:32:08 +00:00
Diego Biurrun
c895987b33 Remove unnecessary -I. option.
Originally committed as revision 6010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 11:42:41 +00:00
Diego Biurrun
5c8dfdb45e Remove duplicate -I option.
Originally committed as revision 6009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 09:55:37 +00:00
Diego Biurrun
f7f03a6303 Remove MPlayer-specific include option hacks.
Originally committed as revision 5723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-12 15:19:51 +00:00
Diego Biurrun
6e03fa5094 Remove erroneous -I../.. flag that points outside of the src directory.
Originally committed as revision 5621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-05 14:09:37 +00:00
Måns Rullgård
42225a3058 remove redundant make variable SUBDIR
Originally committed as revision 5442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 21:57:44 +00:00
Måns Rullgård
21f9324b60 10l to Diego
Originally committed as revision 5441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 21:49:51 +00:00
Diego Biurrun
6d9a242106 libavcodec/libpostproc ---> libpostproc
Originally committed as revision 5440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-01 21:37:48 +00:00
Diego Biurrun
b315042c8c Remove libpostproc.
This library does not fit into Libav as a whole and its code is just a
maintenance burden.  Furthermore it is now available as an external project,
which completely obviates any reason to keep it around.

URL: http://git.videolan.org/?p=libpostproc.git
2012-02-23 19:36:16 +01:00