virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
86,530 Commits 37 Branches 400 Tags 464 MiB
1a4236e025
Commit Graph

2143 Commits

Author SHA1 Message Date
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
Michael Niedermayer
7796f29065 libswscale/tests/swscale: Fix uninitialized variables 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-30 14:23:27 +02:00
Clément Bœsch
172b0e2e88 Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013' 
* commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013':
  ppc: Centralize compiler-specific altivec.h #include handling in one place

Merged-by: Clément Bœsch <u@pkh.me>
 2017-04-26 16:23:28 +02:00
Carl Eugen Hoyos
c1616b454d lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16. 2017-04-12 23:00:04 +02:00
Michael Niedermayer
22b0daa1b3 Bump versions for master after 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:54:12 +02:00
Michael Niedermayer
e1cc7f83df Bump minor for 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:49:45 +02:00
Michael Niedermayer
58b867a7cf Bump minor versions for master after release/3.3 branchpoint 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Michael Niedermayer
fc332f3e29 Bump minor versions for staring release/3.3 branch 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Clément Bœsch
46f4f8ad86 Merge commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50' 
* commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50':
  Adjust printf conversion specifiers to match variable signedness

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-24 13:34:39 +01:00
Clément Bœsch
99dd6fe62c sws/tests/pixdesc_query: remove func wrappers 2017-03-24 00:06:35 +01:00
Clément Bœsch
bc7308aae8 sws: make is{RGB,BGR}inInt functions 2017-03-24 00:06:35 +01:00
Clément Bœsch
fa8db3f597 Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414' 
* commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414':
  swscale: Consistently order input YUV pixel formats

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-21 08:24:39 +01:00
Clément Bœsch
e811f84a2e swscale: cosmetics in is{RGB,BGR}inInt 
Reduce diff with Libav.
 2017-03-20 08:02:30 +01:00
Clément Bœsch
d6635daded swscale: remove unused is{RGB,BGR}inBytes 2017-03-20 08:02:30 +01:00
Clément Bœsch
ff6bc16c5a swscale: use a (more correct) function for isPacked 2017-03-20 08:02:30 +01:00
Clément Bœsch
2b9a52bcca swscale: use a function for isAnyRGB 2017-03-20 08:02:30 +01:00
Clément Bœsch
c30875e8b2 swscale: use a function for isBayer 2017-03-20 08:02:30 +01:00
Clément Bœsch
f052b1b40f swscale: use a function for isGray 2017-03-20 08:02:30 +01:00
Clément Bœsch
08e1376d81 fate: add fate-sws-pixdesc-query 
Test the pixel format querying within libswscale.
 2017-03-20 08:02:30 +01:00
Clément Bœsch
8e950c9b42 Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e' 
* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-19 15:40:03 +01:00
Carl Eugen Hoyos
851f4255e0 lsws/slice: Move a misplaced const. 
Fixes a gcc warning:
libswscale/slice.c:178:56: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
 2017-03-08 00:33:21 +01:00
Carl Eugen Hoyos
a9c20598b5 lsws/input: Do not define unused functions. 
Fixes warnings like the following:
libswscale/input.c:951:13: warning: ‘planar_rgb14be_to_a’ defined but not used
 2017-03-08 00:30:06 +01:00
Philip Langdale
4c2176d45b swscale: add P016 input support 2017-02-01 14:29:11 -08:00
Michael Niedermayer
03ce71e4a1 swscale/swscale: Fix dereference of stride array before null check 
Fixes: CID1396263
Fixes: CID1396271

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-12-23 21:47:47 +01:00
Diego Biurrun
92db508307 build: Generate pkg-config files from Make and not from configure 
This moves work from the configure to the Make stage where it can
be parallelized and ensures that pkgconfig files are updated when
library versions change.

Bug-Id: 449
 2016-12-22 12:30:54 +01:00
Andreas Cadhalpun
319438e2f2 swscale: save ebx register when it is not available 
Configure checks if the ebx register can be used for asm and it has to
be saved if and only if this is not the case.
Without this the build fails when configuring with --toolchain=hardened
--disable-pic on i386 using gcc 4.8:
error: PIC register clobbered by '%ebx' in 'asm'

In that case gcc 4.8 reserves the ebx register for the GOT needed for
PIE, so it can't be used in asm directly.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-12-21 01:26:10 +01:00
Diego Biurrun
ea7ee4b4e3 ppc: Centralize compiler-specific altivec.h #include handling in one place 
Also move #includes into canonical order where appropriate.
 2016-12-14 14:08:43 +01:00
Paul B Mahol
6427c9ffee swscale: add gbr(a)p16 output support 2016-12-01 21:37:25 +01:00
Michael Niedermayer
ac206bb175 swscale/options: Use AV_OPT_TYPE_PIXEL_FMT 
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-20 13:00:22 +01:00
Carl Eugen Hoyos
b5177c7051 lsws: Add GRAY10 conversion. 
Based on 19be5fb7 by Luca Barbato.
 2016-11-14 10:35:06 +01:00
Luca Barbato
19be5fb728 swscale: Add GRAY12 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:49:29 +01:00
Michael Niedermayer
b828788d58 swscale: Add GBRAP10 output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Luca Barbato
2c7d8cbd66 swscale: Add the GBRAP12 output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
873d06c76e swscale/output: Fix alpha shift in yuv2gbrp_full_X_c() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
a340cfef82 swscale/input: Fix alpha bswap for set readAlpPlanar 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Michael Niedermayer
d736b52a04 swscale: Drop is9_OR_10BPS() use, its name is not correct 
Found-by: Luca Barbato
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-11-10 00:33:12 +01:00
Luca Barbato
ab839054e6 swscale: Add GRAY12 2016-11-07 22:42:00 +01:00
Diego Biurrun
1263b2039e Adjust printf conversion specifiers to match variable signedness 2016-10-28 11:22:21 +02:00
Michael Niedermayer
1609935b6c Bump minor versions after 3.2 branchpoint to seperate release 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer
3f3025205f Bump minor versions for 3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer
be9dba5c8a swscale: Properly load alpha for planar rgb 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-10-18 12:58:14 +02:00
Luca Barbato
881477c77b swscale: Add the GBRAP12 output 2016-10-12 21:33:34 +02:00
Kieran Kunhya
81f1f6c3f6 Add GBRAP12 pixel format support 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-10-12 21:33:34 +02:00
Luca Barbato
ef3740c3a0 swscale: Enable GBRP12 output 2016-10-12 18:00:24 +02:00
Michael Niedermayer
f59750641a swscale: x86: Add some forgotten 12-bit planar YUV cases 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2016-10-12 17:39:30 +02:00
Michael Niedermayer
328ea6a9a5 swscale: Add input support for 12-bit formats 
Implemented for AV_PIX_FMT_GBRP12.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2016-10-12 17:39:30 +02:00
Vittorio Giovara
eb54210602 swscale: Add missing yuv444p12 swapping 
Missing from 9bd6ea5695.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2016-10-12 10:42:38 +02:00
Luca Barbato
9bd6ea5695 pixfmt: Add yuv444p12 pixel format 2016-09-27 18:48:30 +02:00
Luca Barbato
0aebbbd024 pixfmt: Add yuv422p12 pixel format 2016-09-27 18:48:30 +02:00