RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
87,949 Commits 36 Branches 392 Tags 302 MiB
Commit Graph

2159 Commits

Author SHA1 Message Date
James Almer 2904db9045 Merge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2' 
* commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2':
  x86util: Port all macros to cpuflags

See d5f8a642f6

Merged-by: James Almer <jamrial@gmail.com>
 2017-10-21 12:15:57 -03:00
Michael Niedermayer 80154b1b3a Bump version for master after 3.4 branchpoint 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-11 02:45:37 +02:00
Michael Niedermayer e1de9eab3a Bump minor versions for branching 3.4 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-10-11 01:23:47 +02:00
Lou Logan 183fd30e0f Fix several typos 
"apix_fmts" found by Marc Péchaud.
"speedloss" found by Mikhail V.

Signed-off-by: Lou Logan <lou@lrcd.com>
 2017-09-21 16:17:02 -08:00
Derek Buitenhuis add7b3bc3f utils: Do not expand a macro with 'defined' in it 
Fixes:

    libswscale/utils.c:1632:5: warning: macro expansion producing 'defined' has undefined behavior [-Wexpansion-to-defined]
    #if USE_MMAP
        ^
    libswscale/utils.c:1577:49: note: expanded from macro 'USE_MMAP'
    #define USE_MMAP (HAVE_MMAP && HAVE_MPROTECT && defined MAP_ANONYMOUS)
                                                    ^
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2017-08-25 13:44:57 +01:00
Carl Eugen Hoyos cb1a3eecac lsws/rgb2rgb: Add unscaled 48bit to 64bit rgb conversion. 
Based on b4befca2 and 6b7849e6 by Paul B Mahol.

Fixes ticket #6608.
 2017-08-24 12:50:06 +02:00
Paul B Mahol de48710c11 libswscale: add gray9 support 2017-08-07 13:09:41 +02:00
James Cowgill 013ec23cbe swscale: fix gbrap16 alpha channel issues 
Fixes filter-pixfmts-scale test failing on big-endian systems due to
alpSrc not being cast to (const int32_t**).

Also fixes distortions in the output alpha channel values by copying the
alpha channel code from the rgba64 case found elsewhere in output.c.

Fixes ticket 6555.

Signed-off-by: James Cowgill <James.Cowgill@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-08-05 23:24:02 +02:00
Clément Bœsch 797c232ef8 sws/tests/pixdesc_query: fix use of free() instead of av_free() 
Fix CID 1415949
 2017-07-30 20:48:57 +02:00
Clément Bœsch 4158fba3cd sws/tests/pixdesc_query: replace rgb based pix fmts with endianess agnostic names 
Fixes ticket #6554
 2017-07-30 16:05:32 +02:00
Clément Bœsch d2c70fc887 sws/tests/pixdesc_query: sort pixel formats 2017-07-30 16:04:36 +02:00
Clément Bœsch ca23d3491d sws/tests/pixdesc_query: save every pix fmts in a list 
This will be required for the next commit.
 2017-07-30 16:04:36 +02:00
Diego Biurrun fd502f4f5f build: Generalize yasm/nasm-related variable names 
None of them are specific to the YASM assembler.

(Cherry-picked from libav commit 39e208f4d4)

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-06-21 17:00:29 -03: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
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
Diego Biurrun 994c4bc107 x86util: Port all macros to cpuflags 
Also do some small cosmetic changes: Drop pointless _MMX suffix from ABSD2
macro name, drop pointless check for MMX support, we always assume MMX is
available in our SIMD code, fix spelling.
 2017-03-14 17:23:32 +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
Diego Biurrun 39e208f4d4 build: Generalize yasm/nasm-related variable names 
None of them are specific to the YASM assembler.
 2017-03-01 10:18:15 +01:00
Philip Langdale 4c2176d45b swscale: add P016 input support 2017-02-01 14:29:11 -08:00
Diego Biurrun 5c0e2b13eb swscale-test: const correctness for pointer variable 
libswscale/swscale-test.c:369:20: warning: passing argument 2 of ‘sws_scale’ from incompatible pointer type [-Wincompatible-pointer-types]
libswscale/swscale.h:207:5: note: expected ‘const uint8_t * const* {aka const unsigned char * const*}’ but argument is of type ‘uint8_t ** {aka unsigned char **}’
 2017-01-24 13:03:57 +01: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