virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
55,826 Commits 37 Branches 400 Tags 465 MiB
983ed20c1c
Commit Graph

1689 Commits

Author SHA1 Message Date
Michael Niedermayer
23b3141261 swscale: improve dither checks 
Bssed on patch by Øyvind Kolås <pippin@gimp.org>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-19 18:33:50 +02:00
Michael Niedermayer
8c50ea2251 swscale: set dither to a specific value for rgb/bgr8 output 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-19 18:31:35 +02:00
Michael Niedermayer
c62801270f swscale: change ff_dither_8x8_128 dimensions to be consistent with the others 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 16:06:59 +02:00
Michael Niedermayer
c14fc4585c Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3' 
* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
  swscale: Move extern declarations for tables to swscale_internal.h

Conflicts:
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:56:48 +02:00
Michael Niedermayer
1ef0b8f9cc Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4' 
* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
  swscale: Mark a bunch of tables only used within one file static

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-16 12:40:32 +02:00
Michael Niedermayer
1e0e193240 sws: add dither enum 
This allows specifying more dither algorithms without using up flags and
without ambiguities.

Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 21:39:32 +02:00
Michael Niedermayer
60e9b8556a swscale_unscaled: make dither_scale static, its not used elsewhere and has no prefix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-15 21:38:22 +02:00
Diego Biurrun
aa2ba8c99e swscale: Move extern declarations for tables to swscale_internal.h 
Also add missing ff_ prefixes where necessary.
 2013-08-15 14:38:03 +02:00
Diego Biurrun
d258531502 swscale: Mark a bunch of tables only used within one file static 2013-08-15 14:38:03 +02:00
Michael Niedermayer
8d745281a4 swscale/utils: Fix potential overflow of srcPos*C before converting to 64bit 
Fixes CID1061054

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 02:56:26 +02:00
Michael Niedermayer
bc721ac9f7 swscale/utils: Fix potential overflow of dstPos*xInc before converting to 64bit 
Fixes CID1061053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-08 02:51:52 +02:00
Michael Niedermayer
a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:16:36 +02:00
Diego Biurrun
b5a138652f Give less generic names to global library option arrays 2013-08-02 19:19:02 +02:00
Michael Niedermayer
8efe96ee6f swscale/fill_rgb2yuv_table: fix default detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-27 01:11:37 +02:00
Michael Niedermayer
a7e45cfa11 swscale/sws_getColorspaceDetails: dont fail for non yuv 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-25 02:50:46 +02:00
Michael Niedermayer
436616fd42 swscale: exchange src & dst chroma pos 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-24 22:43:50 +02:00
clook
b9b1a2c3e4 libswscale: Adding RGB => XYZ support 2013-07-23 01:02:41 +02:00
Michael Niedermayer
6d323ff57a swscale: remove unneeded include assert.h 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 18:52:41 +02:00
Michael Niedermayer
a4b55bbb6f swscale/input: fix 16bit gbrp input 
Fixes Ticket2793

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-19 12:49:27 +02:00
Michael Niedermayer
a0b7e73f8b swscale/options: fix copy and paste typo 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 16:59:29 +02:00
Michael Niedermayer
b405f4e916 swscale: Add support to specify chroma position 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-17 01:59:10 +02:00
Michael Niedermayer
37f4aa133d swscale: move default colorspace setup to sws_init_filter() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-16 02:44:25 +02:00
Michael Niedermayer
c75dde6074 swscale: call handle_format() from the functions that need it 
This should fix some hypothetical issues with alloc/init_context() usage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-14 03:36:19 +02:00
Michael Niedermayer
0fc11e7bad swscale: make handle_formats() safe to be called multiple times 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-14 03:36:19 +02:00
Michael Niedermayer
d5f5e51662 swscale: move format handling to its own function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-14 03:36:19 +02:00
Michael Niedermayer
1ba01d3d46 swscale: treat gray as a fullrage (0-255) format 
Fixes Ticket2684

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-07-08 15:21:48 +02:00
Michael Niedermayer
034b31df2c swscale: Fix PAL8 input with alpha 
Fixes Ticket2158

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-26 15:14:00 +02:00
Hendrik Leppkes
7cdf574c22 swscale: fix filter alignment reduction without inline asm 
Fixes scaling in MSVC/ICL, where inline asm is not present, but the
YASM scaling code is.

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-21 21:01:11 +02:00
Carl Eugen Hoyos
7800b09ece Check more completely for invalid pix_fmts in planarRgb16ToRgb16Wrapper() 
This makes the conversion function more robust.
 2013-06-11 01:14:38 +02:00
Michael Niedermayer
0047da071e swscale/swscale_unscaled: add () 
Fixes order of operations
Fixes CID1030350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-10 03:34:33 +02:00
Carl Eugen Hoyos
d5978c8678 Add unscaled converter from GBRP > 8bit to RGBx48/64. 
Fixes ticket #2633.

Tested-by: Michael Cinquin
 2013-06-06 23:57:50 +02:00
Michael Niedermayer
45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-06-03 11:53:05 +02:00
Diego Biurrun
c011ceef78 swscale: ppc: Remove commented-out define cruft 2013-06-02 18:11:59 +02:00
Michael Niedermayer
a90baa63c3 add YUVJ411P 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-21 12:56:11 +02:00
Paul B Mahol
b154d203b1 swscale/output: silence warning about undefined 'ASSERT_LEVEL' 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:06:16 +00:00
Paul B Mahol
f4b2d3598b swscale/output: remove unused header 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:04:14 +00:00
Michael Niedermayer
e1efacf60b sws/output: yuv2rgb_write() assert that alpha has the correct value in the tables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 15:14:19 +02:00
Michael Niedermayer
5918b7ac41 sws/output: init A1/A2 so that rgba64 ends with 0xffff in the absence of alpha input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-18 01:20:30 +02:00
Michael Niedermayer
c7c71f95f8 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:23:14 +02:00
Michael Niedermayer
ff4680922f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Conflicts:
	doc/APIchanges
	libavcodec/avpicture.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/tiffenc.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libavutil/version.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:10:09 +02:00
Anton Khirnov
e6c4ac7b5f pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* 2013-05-15 07:46:51 +02:00
Michael Niedermayer
e751481cd8 swscale/output: silence compiler warnings about uninitialized variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 18:58:02 +02:00
Michael Niedermayer
145e644aee sws/output: remove offset/coef for alpha in rgba64 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-12 22:01:18 +02:00
Paul B Mahol
e1746d057b swscale: RGBA64 output 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-12 21:47:19 +02:00
Michael Niedermayer
91f4a44ff4 sws/packed_16bpc_bswap: fix handling of negative stride 2013-05-12 17:26:39 +02:00
Michael Niedermayer
63725d158d Revert "sws: support endianness conversion for AV_PIX_FMT_RGBA64" 
This reverts commit 23f7b14f28.

This commit broke fate
 2013-05-12 15:05:25 +02:00
Paul B Mahol
23f7b14f28 sws: support endianness conversion for AV_PIX_FMT_RGBA64 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-12 11:44:20 +00:00
Michael Niedermayer
b2cf655d6e sws: add casts to silence pointer type mismatch warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-10 20:36:12 +02:00
Michael Niedermayer
7ded017983 sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable 
clang did not show this one, so i missed it in the last batch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-10 20:36:12 +02:00
Michael Niedermayer
8ef453ff83 sws/output: silence warnings about uninitialized use of variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-10 01:33:57 +02:00