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>
2015-10-22avfilter,swresample,swscale: use fabs, fabsf instead of FFABSGanesh Ajjanagadde
It is well known that fabs and fabsf are at least as fast and sometimes faster than the FFABS macro, at least on the gcc+glibc combination. For instance, see the reference: http://patchwork.sourceware.org/patch/6735/. This was a patch to glibc in order to remove their usages of a macro. The reason essentially boils down to fabs using the __builtin_fabs of the compiler, while FFABS needs to infer to not use a branch and to simply change the sign bit. Usually the inference works, but sometimes it does not. This may be easily checked by looking at the asm. This also has the added benefit of reducing macro usage, which has problems with side-effects. Note that avcodec is not handled here, as it is huge and most things there are integer arithmetic anyway. Tested with FATE. Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-08Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'Hendrik Leppkes
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-07lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fieldsVittorio Giovara
The new fields can be accessed directly and are more intelligible. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-05-27avfilter/vf_hqdn3d: Initialize the whole LUTMichael Niedermayer
With bps > 8 more than 255..255 are used The initialized table content is left unchanged, But it could also be adjusted for the slight difference of the maximum Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-17avfilter: handle error in query_formats() of a bunch of random video filtersClément Bœsch
2015-02-08avfilter/hqdn3d: an invalid bit depth means a bug, not invalid read dataClément Bœsch
This code looks clumsy, and an assert would probably be more welcome.
2015-01-30Merge commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f'Michael Niedermayer
* commit '22b985d59c007c4422aefe3ef3fca0aa0daafa9f': hqdn3d: check memory allocations and propagate errors Conflicts: libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29hqdn3d: check memory allocations and propagate errorsVittorio Giovara
2014-05-14avfilter/vf_hqdn3: use av_malloc_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-05Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avfilter: Add missing emms_c when needed Merged-by: Michael Niedermayer <michaelni@gmx.at>
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-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-09-12avfilter: various cosmeticsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-11avfilter: remove redundant use of AV_NE() macroPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27lavfi/hqdn3d: make use of AVFILTER_DEFINE_CLASSPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-17Merge commit '16a645adeb758207346a4bbf66766f02734c461e'Michael Niedermayer
* commit '16a645adeb758207346a4bbf66766f02734c461e': vf_pixdesctest: make config_props work properly when called multiple times. vf_hqdn3d: make config_props work properly when called multiple times. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-17vf_hqdn3d: make config_props work properly when called multiple times.Anton Khirnov
Do not leak all the temp buffers.
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_hqdn3d: use the name 's' for the pointer to the private contextAnton Khirnov
This is shorter and consistent across filters.
2013-05-12lavfi/hqdn3d: restore timeline feature.Clément Bœsch
2013-05-12lavfi/hqdn3d: use macros instead of hardcoded indexes.Clément Bœsch
2013-05-10lavfi: use ceil right shift for chroma width/height.Clément Bœsch
This should fix several issues with odd dimensions inputs. lut, vflip, pad and crop video filters also need to be checked for such issues. It's possible sws is also affected.
2013-05-05Merge commit '093804a93cc5da3f95f98265a5df116912443cec'Michael Niedermayer
* commit '093804a93cc5da3f95f98265a5df116912443cec': avfilter: Add av_cold attributes to init/uninit functions Conflicts: libavfilter/af_ashowinfo.c libavfilter/af_volume.c libavfilter/src_movie.c libavfilter/vf_lut.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-04avfilter: Add av_cold attributes to init/uninit functionsDiego Biurrun
2013-04-26lavfi/hqdn3d: remove timeline flag.Clément Bœsch
The filter stores some temporal data, which needs to be done with the passthrough callback system when timeline is enabled. Until then, timeline support is disabled.
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-12avfilter: add missing AV_OPT_FLAG_FILTERING_PARAMMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a'Michael Niedermayer
* commit '8c747d46f721cffa8ea51990805ad1d3a3a4fd0a': vf_hqdn3d: switch to an AVOptions-based system. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
2013-04-09vf_hqdn3d: switch to an AVOptions-based system.Anton Khirnov
2013-03-13Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: hqdn3d: Fix out of array read in LOWPASS cabac: remove unused argument of ff_init_cabac_states() rawdec: fix a typo -- || instead of | Conflicts: libavcodec/cabac.c libavcodec/h264.c libavfilter/vf_hqdn3d.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
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-13hqdn3d: Fix out of array read in LOWPASSLoren Merritt
CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-03-11vf_hqdn3d: 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-02-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: vf_hqdn3d: x86: Add proper arch optimization initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-01vf_hqdn3d: x86: Add proper arch optimization initializationDiego Biurrun
2012-12-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: configure: suppress -fPIC in msvc builds Drop unnecessary 'l' length modifier when printfing double values. truemotion2: Sanitize tm2_read_header() Conflicts: libavcodec/truemotion2.c libavfilter/src_movie.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-31Drop unnecessary 'l' length modifier when printfing double values.Diego Biurrun
%f denotes a double argument and 'l' does nothing in this case according to the C spec.
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-02lavfi/hqdn3d: avoid use of uninitialized variable.Clément Bœsch
2012-11-28vf_hqdn3d: fix permissionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28vf_hqdn3d: switch to filter_frameAnton 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.