Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-28Merge commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa'Michael Niedermayer
* commit 'b6649ab5037fb55f78c2606f3d23cea0867cdeaa': cosmetics: Remove unnecessary extern keywords from function declarations Conflicts: libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-27cosmetics: Remove unnecessary extern keywords from function declarationsDiego Biurrun
2013-03-12Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'Michael Niedermayer
* 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>
2013-03-08Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.Anton Khirnov
2013-02-27swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-27swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGBDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-26swscale-test: fix 3 pointer type warningsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16sws/x86: improve rounding for yuv2yuvXMichael Niedermayer
This tries to compensate for the errors introduced by the rounding of pmulhw Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-11swscale: Disallow conversion to GBRP16Martin Storsjö
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>
2013-02-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: sws: disable yuv2rgb warning for planar rgb. Conflicts: libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'Michael Niedermayer
* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551': sws: dont enable chrSrcHSubSample for planar RGB Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608'Michael Niedermayer
* commit 'e58013dd8f00e17dd98ba64e41c72f1d152f6608': sws: use planarRgbToRgbWrapper only for 8bit per component Conflicts: libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-10Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'Michael Niedermayer
* 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>
2013-02-09sws: disable yuv2rgb warning for planar rgb.Michael Niedermayer
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>
2013-02-09sws: dont enable chrSrcHSubSample for planar RGBMichael Niedermayer
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>
2013-02-09sws: use planarRgbToRgbWrapper only for 8bit per componentMichael Niedermayer
The function doesnt support >8bit currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-09sws: GBRP9, GBRP10, and GBRP16 output supportMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-02-07sws: dont write out of array on bigendianMichael Niedermayer
Fixes Ticket2229 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-04sws: Fix "warning: comparison of distinct pointer types lacks a cast"Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-28Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'Michael Niedermayer
* 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>
2013-01-28swscale: GBRP output supportMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-01-27sws: disable yuv2rgb warning for planar rgb.Michael Niedermayer
planar rgb formats do not use the table Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-27sws: include isRGB in isAnyRGB() so that future RGB formats wont be missed ↵Michael Niedermayer
again Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26sws: add planar RGB formats to isAnyRGBMichael Niedermayer
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>
2013-01-26sws: dont enable chrSrcHSubSample for planar RGBMichael Niedermayer
This code path is not implemented and makes not much sense to implement either. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26sws: use planarRgbToRgbWrapper only for 8bit per componentMichael Niedermayer
The function doesnt support >8bit currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26sws: GBRP9, GBRP10 GBRP12 GBRP14 output supportMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26sws: GBRP output supportMichael Niedermayer
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-25swscale: check flags instead of nb_components to find if pixel format have alphaPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-20sws: check that dither array is not null before memsetMichael Niedermayer
Fixes null pointer dereference Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20sws: Check for unsupported combination of ED/FULL_CHR flagsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-20sws: Fix error diffusion flagMichael Niedermayer
The used flag was mistakenly overlapping with chroma drop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'Michael Niedermayer
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b': x86inc: Rename "program_name" to "private_prefix" configure: Run SHFLAGS through ldflags_filter() Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: fix ED mono dither black levelMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: Enable full chroma resolution when needed for ED ditherMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: Only reset dither state for bitexact modeMichael Niedermayer
the output looks better with a random initial state than all 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: rgb/bgr 4/8 error diffusion ditherMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: add AVOption flag for error diffusion ditherMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-19sws: Support error diffusion dither for mono outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-18x86inc: Rename "program_name" to "private_prefix"Diego Biurrun
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>
2013-01-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2013-01-05swscale: fix NULL checking in sws_alloc_context()Xi Wang
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>
2012-12-29sws: fix warning: cast from pointer to integer of different sizeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29swscale: fix warning: assignment from incompatible pointer typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-26libswscale/swscale-test: fix some const correctnessMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-21Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer
* 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>
2012-12-21miscellaneous typo fixesDiego Biurrun
2012-12-11doxy: add ref for lavfi, lpp and lsws.Clément Bœsch
2012-12-08sws_scale: check input against NULLMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-01swscale: fix 12 and 14 bit YUV planar output with scaling.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>