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 'def03d14687b9d089950ba8e45083e666de4eb68'Clément Bœsch
* commit 'def03d14687b9d089950ba8e45083e666de4eb68': vf_frei0r: Drop overly verbose and broken debug output Merged-by: Clément Bœsch <u@pkh.me>
2016-06-09avfilter: Fix max value of AV_OPT_TYPE_VIDEO_RATEMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-04vf_frei0r: Drop overly verbose and broken debug outputDiego Biurrun
2015-11-09vf_frei0r: also set AVFilterLink.frame_rateMichael Niedermayer
(cherry picked from ffmpeg commit 353cf95f948ef7c6139c8ead79e9eeb9eb8d2e6e) Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-11-02avfilter/vf_frei0r: use av_strtod instead of strtod for added flexibilityGanesh Ajjanagadde
This converts the usage of strtod to av_strtod in order to unify and make number parsing more consistent. This also adds support for SI postfixes. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-14avfilter/all: propagate errors of functions from avfilter/formatsGanesh Ajjanagadde
Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM). This propagates the return values. All of these were found by using av_warn_unused_result, demonstrating its utility. Tested with FATE. I am least sure of the changes to avfilter/filtergraph, since I don't know what/how reduce_format is intended to behave and how it should react to errors. Fixes: CID 1325680, 1325679, 1325678. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Previous version Reviewed-by: Nicolas George <george@nsup.org> Previous version Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-04-08avfilter: handle error in query_formats() in bunch of filtersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-17avfilter/vf_frei0r: fix build with DEBUG enabledMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-17avfilter/vf_frei0r: also set AVFilterLink.frame_rateMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08vf_frei0r: do not increment string if it reached the endVittorio Giovara
Bug-Id: 778 CC: libav-stable@libav.org
2014-03-04vf_frei0r: fix missing end of line characterVittorio Giovara
Error introduced in 61b323ce7c7cdc101eadfd7de2203922b8a39e8d.
2014-03-04Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'Michael Niedermayer
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e': vf_frei0r: prevent a segfault when filter parameters are not set Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'Michael Niedermayer
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9': vf_frei0r: adjust error messages Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-04vf_frei0r: refactor library loading from env variableVittorio Giovara
strtok_r is not needed any more, so remove it from configure.
2014-03-04vf_frei0r: prevent a segfault when filter parameters are not setVittorio Giovara
2014-03-04vf_frei0r: adjust error messagesVittorio Giovara
2014-02-27lavfi/frei0r: factorize plugin loading with static pathMarton Balint
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
2014-02-27lavfi/frei0r: search plugins in lib64 dirs on all architecturesMarton Balint
As Reimar Döffinger pointed out there are non-x86 64bit architectures as well. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Marton Balint <cus@passwd.hu>
2014-02-11lavfi/frei0r: load plugins from lib64 folders as well on 64bit buildsMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu> 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-04avfilter/vf_frei0r: fix out of array readMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-12avfilter: various cosmeticsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZEPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-26lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATEPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-27lavfi/frei0r: make use of AVFILTER_DEFINE_CLASSPaul 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_frei0r: make config_props work properly when called multiple times.Anton Khirnov
Do not leak the initialized filter instance.
2013-05-16Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'Michael Niedermayer
* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8': vf_frei0r: use the name 's' for the pointer to the private context vf_format: use the name 's' for the pointer to the private context vf_fieldorder: use the name 's' for the pointer to the private context vf_fieldorder: cosmetics, remove an extra linebreak Conflicts: libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'Michael Niedermayer
* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110': vf_aspect: use the name 's' for the pointer to the private context Remove commented-out debug #define cruft Conflicts: libavcodec/4xm.c libavcodec/dvdsubdec.c libavcodec/ituh263dec.c libavcodec/mpeg12.c libavfilter/avfilter.c libavfilter/vf_aspect.c libavfilter/vf_fieldorder.c libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-16vf_frei0r: use the name 's' for the pointer to the private contextAnton Khirnov
This is shorter and consistent across filters.
2013-05-16Remove commented-out debug #define cruftDiego Biurrun
2013-05-03lavfi/frei0r: fix crash when parameters are not set.Clément Bœsch
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 '5aa1a668cfae7f617e1a06efad20f87283badd8a'Michael Niedermayer
* commit '5aa1a668cfae7f617e1a06efad20f87283badd8a': vf_frei0r: switch to an AVOptions-based system. Conflicts: doc/filters.texi libavfilter/vf_frei0r.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09lavfi: remove now unused args parameter from AVFilter.initAnton Khirnov
2013-04-09vf_frei0r: switch to an AVOptions-based system.Anton Khirnov
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.
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-11-28vf_frei0r: switch to filter_frame, the 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-11-18lavfi/frei0r: in init() check path loop, free resources in a single pointStefano Sabatini
2012-11-18lavfi/frei0r: extend load_path() to support arbitrarily long pathsStefano Sabatini
2012-11-14lavfi/frei0r: add additional trailing slash in FREI0R_PATH pathsStefano Sabatini
Allow to accept paths with no ending trailing slash. Based on a patch by rogerdpack <rogerpack2005@gmail.com>.
2012-11-14lavfi/frei0r: correctly handle paths longer than 1023 charsStefano Sabatini
2012-10-29lavfi/frei0r: allow for Windows style pathsrogerdpack
Update path handling against the latest Frei0r specification changes. Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-10-29lavfi/frei0r: update link to specStefano Sabatini
Fri0r project moved from piksel.org to frei0r.dyne.org.