virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
70,570 Commits 37 Branches 400 Tags 460 MiB
d898482ae3
Commit Graph

1895 Commits

Author SHA1 Message Date
Michael Niedermayer
ae20682f6b swscale: Add prefix to updateMMXDitherTables() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-27 19:23:46 +01:00
Michael Niedermayer
007498fc1a swscale/utils: clear formatConvBuffer on allocation 
Fixes use of uninitialized memory
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-27 03:13:14 +01:00
Michael Niedermayer
fb8e5044b4 swscale/utils: add asserts to check filterpos 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 01:00:24 +01:00
Michael Niedermayer
1895d414aa swscale/utils: More carefully merge and clear coefficients outside the input 
Fixes out of array read
Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-24 01:00:24 +01:00
Michael Niedermayer
03bffb68f6 swscale: Use av_clip_uintp2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-21 14:49:17 +01:00
Michael Niedermayer
b20426398c swscale/yuv2rgb: Use av_clip_uint8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-21 14:44:47 +01:00
Michael Niedermayer
d501b986a9 swscale/bayer_template: Add () to protect the argument of BAYER_READ() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-18 01:55:15 +01:00
Michael Niedermayer
2a1b79d7e6 Merge commit 'e51f22122d23589e93ac4f0b3e570bb925755915' 
* commit 'e51f22122d23589e93ac4f0b3e570bb925755915':
  swscale: Check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-17 22:22:17 +01:00
Federico Tomassetti
e51f22122d swscale: Check memory allocations 
CC: libav-stable@libav.org
Bug-Id: CID 1267888 / CID 1267890
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-02-17 12:16:43 -05:00
Michael Niedermayer
692b22626e swscale/utils: Limit filter shifting so as not to read from prior the array 
Fixes out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-05 00:33:50 +01:00
Michael Niedermayer
f30798584f swscale/input: fix rgba64 alpha non native 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:21:00 +01:00
Michael Niedermayer
95d04690aa swscale/input: Fix alpha of YA16 input 
Fixes Ticket4278

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-21 21:21:00 +01:00
Vittorio Giovara
2df7277711 swscale: fix gbrap to gbrap alpha scaling 2015-01-16 02:47:15 +01:00
Vittorio Giovara
89df3fd49e swscale: fix warning about incompatible function pointer type 2015-01-16 02:47:10 +01:00
Michael Niedermayer
27513846f6 Merge commit '928061670e873e816daa14827853b7e11221ff5f' 
* commit '928061670e873e816daa14827853b7e11221ff5f':
  libswscale: GBRAP input & output and GBRAP16 input support

Conflicts:
	libswscale/input.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	tests/ref/fate/filter-pixdesc-gbrap
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

See: 5c057433cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-15 05:47:25 +01:00
Paul B Mahol
928061670e libswscale: GBRAP input & output and GBRAP16 input support 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2015-01-14 17:17:24 +01:00
Michael Niedermayer
90de28befd Merge commit '1dd797e3c9f179f957316a0becbec048b42df8aa' 
* commit '1dd797e3c9f179f957316a0becbec048b42df8aa':
  swscale: check memory allocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-01-06 21:44:50 +01:00
Vittorio Giovara
1dd797e3c9 swscale: check memory allocations 
CC: libav-stable@libav.org
Bug-Id: CID 1257779
 2015-01-05 15:35:39 +01:00
Kieran Kunhya
18982f084c swscale: Pass through chroma positions in sws_getCachedContext 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-26 17:55:12 +01:00
Michael Niedermayer
3a2bed1f9e swscale/yuv2rgb: Fix width % 4 != 0 with bgr4_byte/rgb4_byte 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-24 00:33:21 +01:00
Michael Niedermayer
3848512d48 swscale/yuv2rgb: Fix width % 4 != 0 with bgr4/rgb4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-24 00:32:53 +01:00
Michael Niedermayer
3d00ba2688 swscale/yuv2rgb: fix width % 8 != 0 and rgb/bgr8 output 
Fixes Ticket2570

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-24 00:23:49 +01:00
Michael Niedermayer
2a983ff7fe swscale: increase yuv2rgb table headroom 
Fixes out of array access
Fixes: case2_bad_read_yuv2rgbx32.mp4
Found-by: Michal Zalewski <lcamtuf@coredump.cx>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-16 23:37:26 +01:00
Michael Niedermayer
e827f65618 Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20' 
* commit '33c827f632f95ffe3399b695a5a0d47b366b6e20':
  swscale: Properly scale YUV

Conflicts:
	libswscale/swscale_unscaled.c
	tests/ref/fate/filter-pixdesc-yuv420p10be
	tests/ref/fate/filter-pixdesc-yuv420p10le
	tests/ref/fate/filter-pixdesc-yuv420p9be
	tests/ref/fate/filter-pixdesc-yuv420p9le
	tests/ref/fate/filter-pixdesc-yuva420p10be
	tests/ref/fate/filter-pixdesc-yuva420p10le
	tests/ref/fate/filter-pixdesc-yuva420p9be
	tests/ref/fate/filter-pixdesc-yuva420p9le
	tests/ref/fate/filter-pixfmts-copy
	tests/ref/fate/filter-pixfmts-null
	tests/ref/fate/filter-pixfmts-scale
	tests/ref/fate/filter-pixfmts-vflip

See: abe0b8e9f3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-06 01:30:08 +01:00
Derek Buitenhuis
33c827f632 swscale: Properly scale YUV 
Only shift limited range luma, and always only shift chroma
for upconversion.

Based off a patch by Michael Niedermayer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-12-05 13:03:49 +00:00
Michael Niedermayer
8524558858 swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output 
Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-03 20:21:56 +01:00
Michael Niedermayer
4388e78a0f swscale/x86/rgb2rgb_template: handle the first 2 lines with C in rgb24toyv12_*() 
This avoids out of array accesses
Should fix Ticket3451

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-20 01:20:31 +01:00
Michael Niedermayer
2f6bb86f85 swscale/utils: support bayer input + scaling, and bayer input + any supported output 
Fixes Ticket4053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 23:59:37 +01:00
Rong Yan
e74e14608f libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian 
add marcos GET_LS() GET_VF() LOAD_FILTER() LOAD_L1() GET_VF4() FIRST_LOAD() UPDATE_PTR() LOAD_SRCV() LOAD_SRCV8() GET_VFD() for POWER LE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-12 15:15:03 +01:00
Kieran Kunhya
b546023b93 swscale: fix yuv2yuvX_8 assembly on x86 
use_mmx_vfilter check/fix by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-09 23:52:17 +01:00
Michael Niedermayer
fa040c2247 Merge commit 'fc1eda543c6ef043300612db90da5cfd972af650' 
* commit 'fc1eda543c6ef043300612db90da5cfd972af650':
  swscale: fix sign extensions in yuv planar conversion

Conflicts:
	libswscale/rgb2rgb_template.c

See: a07e9d72a1
See: a30972609c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-18 23:40:50 +02:00
Vittorio Giovara
fc1eda543c swscale: fix sign extensions in yuv planar conversion 
Casting the left-most byte to unsigned avoids an undefined
result of the shift by 24 if bit 7 is set.

yuvPlanartouyvy_c and yuvPlanartoyuy2_c are affected.

CC: libav-stable@libav.org
Bug-Id: CID 732281 / CID 732282
 2014-10-18 16:15:10 +01:00
Michael Niedermayer
fba894615d swscale: support internal scaler cascades 
Fixes Ticket3170

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-11 05:05:17 +02:00
James Almer
fb7d8d50bc swscale: remove obsolete FF_API_SWS_FORMAT_NAME cruft 
Signed-off-by: James Almer <jamrial@gmail.com>
 2014-10-05 17:10:29 -03:00
Michael Niedermayer
61af6bebb4 swscale: Allow chroma samples to be above and to the left of luma samples 
Found-by: Kierank
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-21 12:23:24 +02:00
Vitor Sessak
55d11d277b swscale/x86: do not expect registers to be preserved across inline ASM blocks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-18 00:03:29 +02:00
Clément Bœsch
d469aa8cfa sws: use av_clip() instead of av_clip_c() 2014-09-16 16:57:20 +02:00
James Almer
9ffac3d00d lsws: duplicate ff_log2_tab 
libswscale uses the table but wasn't duplicating it like the rest of the libs.
This should fix compilation failures on msvc/icl after lavu stopped exporting
internal functions and tables.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-12 20:52:21 +02:00
Michael Niedermayer
a57ece0cb4 Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8' 
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-10 00:26:45 +02:00
Michael Niedermayer
3e41d2e612 Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e' 
* commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e':
  Postpone API-incompatible changes until the next bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-09 22:19:45 +02:00
Anton Khirnov
1985c2e75c Bump major versions of all libraries. 2014-08-09 16:58:33 +00:00
Anton Khirnov
f4c444e17d Postpone API-incompatible changes until the next bump. 2014-08-09 16:57:10 +00:00
Michael Niedermayer
4917fecf4a Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e' 
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
  swscale: Undeprecate sws_getContext()

Conflicts:
	libswscale/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-07 20:52:40 +02:00
Diego Biurrun
bb789016d4 swscale: Undeprecate sws_getContext() 
sws_getCachedContext is not a full replacement for the function.
 2014-08-07 04:03:00 -07:00
Michael Niedermayer
aee99a5d44 swscale/swscale_internal: fix ya16 -> rgba 
Fixes Ticket644

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 01:51:11 +02:00
Michael Niedermayer
700bf1fa4e swscale/swscale_unscaled: fix ya16 input 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-05 00:33:27 +02:00
Michael Niedermayer
2f5bf2f7f2 Merge commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820' 
* commit 'f84a1b597c29dc035b8d5529ef88c2d7ff057820':
  swscale: support AV_PIX_FMT_YA16 as input

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 22:32:13 +02:00
Michael Niedermayer
4c8bc6fdee Merge commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5' 
* commit 'e96c3b81cadd0ba84d43b1f3a54980df3785d9a5':
  avutil: rename AV_PIX_FMT_Y400A to AV_PIX_FMT_YA8

Conflicts:
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/raw.c
	libavutil/pixdesc.c
	libavutil/pixfmt.h
	libavutil/version.h
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 21:48:00 +02:00
Michael Niedermayer
8862c49661 Merge commit '5420099cab1e915b191cceccec4364f54cec6e52' 
* commit '5420099cab1e915b191cceccec4364f54cec6e52':
  swscale: correctly pad destination buffer in rgb conversion

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-08-04 21:18:17 +02:00
Vittorio Giovara
f84a1b597c swscale: support AV_PIX_FMT_YA16 as input 
Based on a long debug session with Kostya.
 2014-08-04 12:56:05 +01:00