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-05-05Merge commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70'Michael Niedermayer
* commit '2b677ffca54a5fbef9c8860841c32f28ecd68f70': swscale: Add av_cold attributes to init functions missing them Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-05Avoid incorrect deprecated pixel format warning.Reimar Döffinger
Should only be printed if a "JPEG" format was used, not for e.g. XYZ. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2013-05-05swscale: Add av_cold attributes to init functions missing themDiego Biurrun
2013-05-03lavu: add planar 16 bit and 8 bit rgb with alphaPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-01Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d'Michael Niedermayer
* commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d': ppc: Drop unnecessary ff_ name prefixes from static functions x86: Drop unnecessary ff_ name prefixes from static functions arm: Drop unnecessary ff_ name prefixes from static functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01sws: share xyzgamma tables.Michael Niedermayer
They are currently always constant and thus theres no point to store them in the context. This makes the context 16kb smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30ppc: Drop unnecessary ff_ name prefixes from static functionsDiego Biurrun
2013-04-28sws: fix typo in xyz2rgb matrix use.Michael Niedermayer
Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: Check for malloc failure of rgb0_tmpMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: support xyz inputMichael Niedermayer
The implementation is heavily based on Matthias Buerchers and Nicolas Bertrands vf_xyz2rgb.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: remove hack to support partial convert / xyz bswapingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: enable xyz12, this for now is just for swaping between le and beMichael Niedermayer
Needed for fixing fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: add 16bit gbrp formats to packed_16bpc_bswap()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-28sws: extend packed_16bpc_bswap code to handle planar formatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-18Fix libswscale compilation with --disable-optimizations on x86-32.Carl Eugen Hoyos
Fixes ticket #2477.
2013-04-16sws: Skip ff_yuv2rgb_c_init_tables() when the output is YUVMichael Niedermayer
Fixes "20bpp not supported by yuv2rgb" warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16sws/fill_rgb2yuv_table: use ROUNDED_DIVMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16sws/fill_rgb2yuv_table: increase precission to 32bitMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16sws/fill_rgb2yuv_table: avoid 2 divisionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16sws: fix alignment of rgb2yuvMichael Niedermayer
This should fix mingw32 fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws/x86: update RENAME(rgb24toyv12)() to using the user provided rgb2yuv tableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws: remove forgotten FAST_BGR2YV12 defineMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws/x86: remove 8bit rgb2yuv coefficient case for rgb24toyv12 special converterMichael Niedermayer
This simplifies the code and improves quality at the expense of a slight slowdown of a rarely used function (no fate test uses it). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws: Update rgb24toyv12_c() to user supplied rgb2yuv tablesMichael Niedermayer
As the function arguments change, we also change the function name to ensure that anyone using this (non public) function doesnt end with hard to debug crashes. The new name also has a proper prefix. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws/"rgb2rgb": drop RGB2YUV_SHIFTMichael Niedermayer
Fixes a warning and increases the precission the coefficients Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws/x86: update rgba->yuv to use user supplied tableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws/x86: update rgb/bgr->yuv code to use provided coefficient tableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws: init input_rgb2yuv_table depending on yuv colorspaceMichael Niedermayer
For the default table we keep using the exact previous coefficients, this way individual functions can be updated seperately without breaking fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-15sws: move RGB2YUV_SHIFT to swscale_internal.hMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14sws/input: replace hardcoded rgb2yuv coefficients by tableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14swscale/output: fix alpha scale in the new functionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14sws/output: add yuv2rgb_full_1_c_template()Michael Niedermayer
7500->4500 cycles on sandybridge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14sws/output: add +yuv2rgb_full_2_c_template()Michael Niedermayer
8100 cycles -> 5800 cycles on sandybridge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-14sws/output: factor yuv2rgb_write_full() outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10Replace all occurrences of PRI in sscanf() calls with SCNJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
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>