summaryrefslogtreecommitdiff
path: root/libswscale
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer2013-03-281-14/+14
|\ | | | | | | | | | | | | | | | | | | * commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun2013-03-271-11/+11
| |
* | Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer2013-03-121-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '7b89cd20d844cbe763ca34e63e99d110043cf241': eamad: allocate a dummy reference frame when the real one is missing Replace remaining includes of audioconvert.h with channel_layout.h Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.Anton Khirnov2013-03-081-6/+6
| |
| * swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis2013-02-271-0/+78
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * swscale: Disallow conversion to GBRP16Martin Storsjö2013-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts parts of d6d5ef5534d582, that didn't work right. (The tests that were added failed on big endian, and the output looked garbled on little endian as well.) This is due to the fact that the intermediate scaling values (from e.g. hScale8To19_c or hScale16To19_c) are stored as int32_t and thus requires a separate output function, while yuv2gbrp_full_X_c only interprets it as int16_t. Signed-off-by: Martin Storsjö <martin@martin.st>
* | swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis2013-02-271-0/+78
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | swscale-test: fix 3 pointer type warningsMichael Niedermayer2013-02-261-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws/x86: improve rounding for yuv2yuvXMichael Niedermayer2013-02-152-2/+23
| | | | | | | | | | | | | | This tries to compensate for the errors introduced by the rounding of pmulhw Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-101-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: sws: disable yuv2rgb warning for planar rgb. Conflicts: libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sws: disable yuv2rgb warning for planar rgb.Michael Niedermayer2013-02-091-1/+2
| | | | | | | | | | | | | | planar rgb formats do not use the table Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'Michael Niedermayer2013-02-101-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551': sws: dont enable chrSrcHSubSample for planar RGB Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sws: dont enable chrSrcHSubSample for planar RGBMichael Niedermayer2013-02-091-0/+3
| | | | | | | | | | | | | | | | This code path is not implemented and makes not much sense to implement either. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'Michael Niedermayer2013-02-101-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608': sws: use planarRgbToRgbWrapper only for 8bit per component Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sws: use planarRgbToRgbWrapper only for 8bit per componentMichael Niedermayer2013-02-091-1/+9
| | | | | | | | | | | | | | The function doesnt support >8bit currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'Michael Niedermayer2013-02-102-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821': sws: GBRP9, GBRP10, and GBRP16 output support Conflicts: libswscale/output.c libswscale/utils.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sws: GBRP9, GBRP10, and GBRP16 output supportMichael Niedermayer2013-02-092-11/+33
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | sws: dont write out of array on bigendianMichael Niedermayer2013-02-071-0/+3
| | | | | | | | | | | | Fixes Ticket2229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Fix "warning: comparison of distinct pointer types lacks a cast"Michael Niedermayer2013-02-041-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'Michael Niedermayer2013-01-283-23/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '05b0998f511ffa699407465d48c7d5805f746ad2': dsputil: Fix error by not using redzone and register name swscale: GBRP output support Conflicts: libswscale/output.c libswscale/swscale.c libswscale/swscale_internal.h libswscale/utils.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: GBRP output supportMichael Niedermayer2013-01-274-6/+125
| | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | sws: disable yuv2rgb warning for planar rgb.Michael Niedermayer2013-01-261-1/+2
| | | | | | | | | | | | planar rgb formats do not use the table Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: include isRGB in isAnyRGB() so that future RGB formats wont be missed ↵Michael Niedermayer2013-01-261-0/+1
| | | | | | | | | | | | again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: add planar RGB formats to isAnyRGBMichael Niedermayer2013-01-262-3/+11
| | | | | | | | | | | | | | We have to make some symetric changes elsewhere as this increases the precission with which samples are stored. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: dont enable chrSrcHSubSample for planar RGBMichael Niedermayer2013-01-261-0/+4
| | | | | | | | | | | | | | This code path is not implemented and makes not much sense to implement either. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: use planarRgbToRgbWrapper only for 8bit per componentMichael Niedermayer2013-01-261-1/+1
| | | | | | | | | | | | The function doesnt support >8bit currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: GBRP9, GBRP10 GBRP12 GBRP14 output supportMichael Niedermayer2013-01-262-13/+37
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: GBRP output supportMichael Niedermayer2013-01-264-7/+120
| | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: check flags instead of nb_components to find if pixel format have alphaPaul B Mahol2013-01-251-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | sws: check that dither array is not null before memsetMichael Niedermayer2013-01-191-1/+1
| | | | | | | | | | | | Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Check for unsupported combination of ED/FULL_CHR flagsMichael Niedermayer2013-01-191-5/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Fix error diffusion flagMichael Niedermayer2013-01-192-3/+3
| | | | | | | | | | | | The used flag was mistakenly overlapping with chroma drop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'Michael Niedermayer2013-01-191-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b': x86inc: Rename "program_name" to "private_prefix" configure: Run SHFLAGS through ldflags_filter() Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Rename "program_name" to "private_prefix"Diego Biurrun2013-01-181-4/+4
| | | | | | | | | | | | | | The new name is more descriptive and will allow defining a separate public prefix for externally visible library symbols. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | sws: fix ED mono dither black levelMichael Niedermayer2013-01-191-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Enable full chroma resolution when needed for ED ditherMichael Niedermayer2013-01-191-0/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Only reset dither state for bitexact modeMichael Niedermayer2013-01-191-1/+1
| | | | | | | | | | | | | | the output looks better with a random initial state than all 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: rgb/bgr 4/8 error diffusion ditherMichael Niedermayer2013-01-192-1/+64
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: add AVOption flag for error diffusion ditherMichael Niedermayer2013-01-191-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: Support error diffusion dither for mono outputMichael Niedermayer2013-01-186-4/+79
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-051-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: fix NULL checking in sws_alloc_context() mxfdec: fix NULL checking in mxf_get_sorted_table_segments() finalize changelog for version 9 Conflicts: Changelog libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * swscale: fix NULL checking in sws_alloc_context()Xi Wang2013-01-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | sws_getCachedContext() and sws_getContext() expect sws_alloc_context() to return NULL when out of memory, as follows. if (!(context = sws_alloc_context())) return NULL; This patch fixes sws_alloc_context() to return NULL in that case. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | sws: fix warning: cast from pointer to integer of different sizeMichael Niedermayer2012-12-291-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix warning: assignment from incompatible pointer typeMichael Niedermayer2012-12-291-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libswscale/swscale-test: fix some const correctnessMichael Niedermayer2012-12-261-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-212-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-212-2/+2
| |
* | doxy: add ref for lavfi, lpp and lsws.Clément Bœsch2012-12-111-2/+11
| |
* | sws_scale: check input against NULLMichael Niedermayer2012-12-071-2/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swscale: fix 12 and 14 bit YUV planar output with scaling.Michael Niedermayer2012-12-011-2/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status