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-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>
2012-11-29lsws: define version in SWScaler classStefano Sabatini
The version number is useful to check the libavutil version against which the library was compiled at run-time, which in turn may be useful to deal with binary compatibility issues.
2012-11-19Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: h264_intrapred: Fix C function names in comments x86: SPLATD: port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-18x86: SPLATD: port to cpuflagsDiego Biurrun
2012-11-17Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: add a bink version 'b' test FATE: add a bink version 'i' test libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR Conflicts: tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-16libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJORJanne Grunau
SWS_CPU_CAPS are deprecated and slated to removed with libswscale major version 3. No need to provide a SWS_CPU_CAPS_MMX2 as backward compatibility define under the same explicit condition.
2012-11-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: mmx2 ---> mmxext in asm constructs Conflicts: libavcodec/x86/h264_chromamc_10bit.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14x86: mmx2 ---> mmxext in asm constructsDiego Biurrun
2012-11-10Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: x86: PALIGNR: port to cpuflags x86: h264_qpel_10bit: port to cpuflags Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-10x86: PALIGNR: port to cpuflagsDiego Biurrun
2012-11-01Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'Michael Niedermayer
* commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415': x86: h264_chromamc_10bit: drop pointless PAVG %define x86: mmx2 ---> mmxext in function names swscale: do not forget to swap data in formats with different endianness Conflicts: libavcodec/x86/dsputil_mmx.c libavfilter/x86/gradfun.c libswscale/input.c libswscale/utils.c libswscale/x86/swscale.c tests/ref/lavfi/pixfmts_scale Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-01sws: bump micro for range bugfixMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31x86: mmx2 ---> mmxext in function namesDiego Biurrun
2012-10-31swscale: do not forget to swap data in formats with different endiannessKostya Shishkov
Otherwise during scaling it will try to interpret input in the wrong way and that leads to the test results disagreeing on different platforms and with different optimizations. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2012-10-31Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'Michael Niedermayer
* commit 'be923ed659016350592acb9b3346f706f8170ac5': x86: fmtconvert: port to cpuflags x86: MMX2 ---> MMXEXT in macro names Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit 'a65bdceb060628881578afb29df4eb222421381f'Michael Niedermayer
* commit 'a65bdceb060628881578afb29df4eb222421381f': x86: mmx2 ---> mmxext in variable names Conflicts: libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '652f5185945c8405fc57aed353286858df8d066f'Michael Niedermayer
* commit '652f5185945c8405fc57aed353286858df8d066f': x86: mmx2 ---> mmxext in comments and messages Conflicts: libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'Michael Niedermayer
* commit '04581c8c77ce779e4e70684ac45302972766be0f': x86: yasm: Use complete source path for macro helper %includes Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'Michael Niedermayer
* commit '6860b4081d046558c44b1b42f22022ea341a2a73': x86: include x86inc.asm in x86util.asm cng: Reindent some incorrectly indented lines cngdec: Allow flushing the decoder cngdec: Make the dbov variable have the right unit cngdec: Fix the memset size to cover the full array cngdec: Update the LPC coefficients after averaging the reflection coefficients configure: fix print_config() with broke awks Conflicts: libavcodec/x86/ac3dsp.asm libavcodec/x86/dct32.asm libavcodec/x86/deinterlace.asm libavcodec/x86/dsputil.asm libavcodec/x86/dsputilenc.asm libavcodec/x86/fft.asm libavcodec/x86/fmtconvert.asm libavcodec/x86/h264_chromamc.asm libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264_idct.asm libavcodec/x86/h264_idct_10bit.asm libavcodec/x86/h264_intrapred.asm libavcodec/x86/h264_intrapred_10bit.asm libavcodec/x86/h264_weight.asm libavcodec/x86/vc1dsp.asm libavcodec/x86/vp3dsp.asm libavcodec/x86/vp56dsp.asm libavcodec/x86/vp8dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31sws: fix handling of big endian alphaMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31x86: MMX2 ---> MMXEXT in macro namesDiego Biurrun
2012-10-31x86: mmx2 ---> mmxext in variable namesDiego Biurrun
2012-10-31x86: mmx2 ---> mmxext in comments and messagesDiego Biurrun
2012-10-31x86: yasm: Use complete source path for macro helper %includesDiego Biurrun
This is more consistent with the way we handle C #includes and it simplifies the build system.
2012-10-31x86: include x86inc.asm in x86util.asmDiego Biurrun
This is necessary to allow refactoring some x86util macros with cpuflags.
2012-10-30swscale.c:remove fill_plane9or10() use fillPlane16()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30sws: move fillPlane16() to header so it can be used from more than 1 placeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30sws_unscaled: drop fill_plane9or10()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30sws: fix BE/LE handling for fillPlane16()Michael Niedermayer
Based on fill_plane9or10() by luca barbato Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: pixfmt: support more yuva formats swscale: support gray to 9bit and 10bit formats configure: rewrite print_config() function using awk FATE: fix (AD)PCM test dependencies broken in e519990 Use ptrdiff_t instead of int for intra pred "stride" function parameter. x86: use PRED4x4/8x8/8x8L/16x16 macros to declare intrapred prototypes. Conflicts: libavcodec/h264pred.c libavcodec/h264pred_template.c libavutil/pixfmt.h libswscale/swscale_unscaled.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>
2012-10-30pixfmt: support more yuva formatsLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-30swscale: support gray to 9bit and 10bit formatsLuca Barbato
With the input of Kostya and Ronald.
2012-10-28sws: rgb has no range, avoid random results if the user tries to mess with ↵Michael Niedermayer
it anyway. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27sws: loose the minimum dimension checksMichael Niedermayer
A few quick tests show no fundamental problem with such diemnsions Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27sws: improve error messagesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27sws: fix extreem downscalingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27sws_getGaussianVec: check variance and qualityMichael Niedermayer
Found-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27sws_allocVec: check length validityMichael Niedermayer
Found-by: Reimar Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer
* commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24yuv2rgb: fix integer overflow in fill_gv_table()Michael Niedermayer
Fixes CID703747 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24yuv2rgb: fix integer overflow in fill_tableMichael Niedermayer
Fixes CID703748 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>