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
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-01-27avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPATDerek Buitenhuis
Libav, for some reason, merged this as a public API function. This will aid in future merges. A define is left for backwards compat, just in case some person used it, since it is in a public header. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-25lavfi: Use AV_CEIL_RSHIFT where neededVittorio Giovara
2015-03-17avfilter: handle error in query_formats() of a bunch of random video filtersClément Bœsch
2014-03-05avfilter: Add missing emms_c when neededLuca Barbato
Arch specific calls should have an emms_c following to keep the cpu state consistent. Reported-By: wm4 CC: libav-stable@libav.org
2013-11-01avfilter/vf_gradfun: add emms_c() for mmxextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-28lavfi: do not export the filters from shared objectsAnton Khirnov
2013-10-23Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'Michael Niedermayer
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d': avfilter: Fix typo in Loren's email address Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-23avfilter: Fix typo in Loren's email addressDiego Biurrun
2013-09-21avfilter: remove duplicate includesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-15avfilter/vf_gradfun: use av_calloc()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-12avfilter: various cosmeticsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-22lavfi/gradfun: support gbrpPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-03avfilter: fix plane validity checksMichael Niedermayer
Fixes out of array accesses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-30Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'Michael Niedermayer
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8': avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo Conflicts: doc/general.texi libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typoDiego Biurrun
Also fix some similar typos in comments and documentation.
2013-07-26lavfi/gradfun: remove nv21/nv12 as they are not supportedPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17Merge commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7'Michael Niedermayer
* commit 'd371c3c2e2830d9783465ecfe1ab7d93351083b7': vf_frei0r: make config_props work properly when called multiple times. vf_gradfun: make config_props work properly when called multiple times. vf_lut: make config_props work properly when called multiple times. Conflicts: libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17vf_gradfun: make config_props work properly when called multiple times.Anton Khirnov
2013-05-16Merge commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8'Michael Niedermayer
* commit '4753f802c00853859b7b4b8fdb79c35e082cb7f8': vf_libopencv: use the name 's' for the pointer to the private context vf_hqdn3d: use the name 's' for the pointer to the private context vf_hflip: use the name 's' for the pointer to the private context vf_gradfun: use the name 's' for the pointer to the private context Conflicts: libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16vf_gradfun: use the name 's' for the pointer to the private contextAnton Khirnov
This is shorter and consistent across filters.
2013-05-12lavfi: replace passthrough_filter_frame with a flag.Clément Bœsch
With the introduction of AVFilterContext->is_disabled, we can simplify the custom passthrough mode in filters. This commit is technically a small compat break, but the timeline was introduced very recently. Doxy by Stefano Sabatini.
2013-05-09lavu: add FF_CEIL_RSHIFT and use it in various places.Clément Bœsch
2013-04-23lavfi: add timeline support.Clément Bœsch
Flag added in a few simple filters. A bunch of other filters can likely use the feature as well.
2013-04-12lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
Conflicts: libavfilter/avfilter.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_select.c libavfilter/vf_setpts.c libavfilter/vsrc_color.c libavfilter/vsrc_movie.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10Merge commit '7ed833d78ea661d619124fd898547a900f6480bc'Michael Niedermayer
* commit '7ed833d78ea661d619124fd898547a900f6480bc': vf_gradfun: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/gradfun.h libavfilter/vf_gradfun.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
2013-04-09vf_gradfun: switch to an AVOptions-based system.Anton Khirnov
2013-03-28lavfi/gradfun: fix rounding in MMX code.Clément Bœsch
Current code divides before increasing precision. Also reduce upper bound for strength from 255 to 64. This will prevent an overflow in the SSSE3 and MMX filter_line code: delta is expressed as an u16 being shifted by 2 to the left. If it overflows, having a strength not above 64 will make sure that m is set to 0 (making the m*m*delta >> 14 expression void). A value above 64 should not make any sense unless gradfun is used as a blur filter. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-28lavfi/gradfun: do not increment DC pointer for odd values.Clément Bœsch
First DC is only used once otherwise. This also makes the code consistent with ASM versions. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-24lavfi/gradfun: use standard options parsing.Clément Bœsch
2013-03-13Merge commit '555000c7d5c1e13043a948ebc48d2939b0ba6536'Michael Niedermayer
* commit '555000c7d5c1e13043a948ebc48d2939b0ba6536': h264: check that DPB is allocated before accessing it in flush_dpb() vf_hqdn3d: fix uninitialized variable use vf_gradfun: fix uninitialized variable use Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-11vf_gradfun: fix uninitialized variable useAnton Khirnov
CC:libav-stable@libav.org
2013-03-10Merge commit '7e350379f87e7f74420b4813170fe808e2313911'Michael Niedermayer
* commit '7e350379f87e7f74420b4813170fe808e2313911': lavfi: switch to AVFrame. Conflicts: doc/filters.texi libavfilter/af_ashowinfo.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.c libavfilter/buffersrc.c libavfilter/buffersrc.h libavfilter/f_select.c libavfilter/f_setpts.c libavfilter/fifo.c libavfilter/split.c libavfilter/src_movie.c libavfilter/version.h libavfilter/vf_aspect.c libavfilter/vf_bbox.c libavfilter/vf_blackframe.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hqdn3d.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_vflip.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavfilter/yadif.h Following are notes about the merge authorship and various technical details. Michael Niedermayer: * Main merge operation, notably avfilter.c and video.c * Switch to AVFrame: - afade - anullsrc - apad - aresample - blackframe - deshake - idet - il - mandelbrot - mptestsrc - noise - setfield - smartblur - tinterlace * various merge changes and fixes in: - ashowinfo - blackdetect - field - fps - select - testsrc - yadif Nicolas George: * Switch to AVFrame: - make rawdec work with refcounted frames. Adapted from commit 759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov. Also, fix the use of || instead of | in a flags check. - make buffer sink and src, audio and video work all together Clément Bœsch: * Switch to AVFrame: - aevalsrc - alphaextract - blend - cellauto - colormatrix - concat - earwax - ebur128 - edgedetect - geq - histeq - histogram - hue - kerndeint - life - movie - mp (with the help of Michael) - overlay - pad - pan - pp - pp - removelogo - sendcmd - showspectrum - showwaves - silencedetect - stereo3d - subtitles - super2xsai - swapuv - thumbnail - tile Hendrik Leppkes: * Switch to AVFrame: - aconvert - amerge - asetnsamples - atempo - biquads Matthieu Bouron: * Switch to AVFrame - alphamerge - decimate - volumedetect Stefano Sabatini: * Switch to AVFrame: - astreamsync - flite - framestep Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Clément Bœsch <ubitux@gmail.com> Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-08lavfi: switch to AVFrame.Anton Khirnov
Deprecate AVFilterBuffer/AVFilterBufferRef and everything related to it and use AVFrame instead.
2013-01-13lavfi/gradfun: support YUV440PPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-12-19lavfi/gradfun: small align cosmetics.Clément Bœsch
2012-12-19lavfi/gradfun: support named options.Clément Bœsch
This breaks usage for out-of-range values.
2012-12-19lavfi/gradfun: reduce up limit for threshold.Clément Bœsch
This will prevent an overflow in the SSSE3 and MMX filter_line code: delta is expressed as an u16 being shifted by 2 to the left. If it overflows, having a strength not above 64 will make sure that m is set to 0 (making the m*m*delta >> 14 expression void). A value above 64 should not make any sense unless gradfun is used as a blur filter.
2012-12-19lavfi/gradfun: do not increment DC pointer for odd values.Clément Bœsch
First DC is only used once otherwise. This also makes the code consistent with ASM versions.
2012-12-04lavfi: remove some video w/h settings after avfilter_copy_buffer_ref_props.Clément Bœsch
video->[wh] will be set with the same values as the input after avfilter_copy_buffer_ref_props. These filters don't change the size of the input so there is no need for this code.
2012-12-03lavfi/gradfun: remove check for AV_PERM_PRESERVE.Clément Bœsch
This check does not make sense in this context, see doc/filter_design.txt for details about the usage of such flag.
2012-12-02lavfi/gradfun: avoid use of uninitialized variable.Clément Bœsch
2012-11-28vf_gradfun: switch to filter_frame, this filter did not support slicesAnton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28lavfi: merge start_frame/draw_slice/end_frameAnton Khirnov
Any alleged performance benefits gained from the split are purely mythological and do not justify added code complexity.
2012-10-13Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'Michael Niedermayer
* commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507': avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX) rtspdec: Set the default port for listen mode, if none is specified tscc2: Fix an out of array access rtmpproto: Fix an out of array write rtspdec: Fix use of uninitialized byte vp8: reset loopfilter delta values at keyframes. avutil: add yuva422p and yuva444p formats Conflicts: libavutil/pixdesc.c libavutil/pixfmt.h 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-12avfilter: call x86 init functions under if (ARCH_X86), not if (HAVE_MMX)Diego Biurrun
2012-10-12Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'Michael Niedermayer
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627': lavfi: do not use av_pix_fmt_descriptors directly. Conflicts: libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/filtfmts.c libavfilter/vf_ass.c libavfilter/vf_boxblur.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c Merged-by: Michael Niedermayer <michaelni@gmx.at>