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-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-05lavfi: port MP stereo3d filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-22blend filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-16lavfi: port MP noise filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-10lavfi: port MP il filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-02-09histogram filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-31Port biquads filters from SoXPaul B Mahol
Adds allpass, bass, bandpass, bandreject, biquad, equalizer, highpass, lowpass and treble filter. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-21afade filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-01-05lavfi: add histeq filterStefano Sabatini
This is a port of virtual dub's histogram equalization filter by Donald A. Graft. Based on the work by Jérémy Tran <tran.jeremy.av@gmail.com>, done for SOCIS 2012.
2013-01-05lavfi: add kerndeint filterStefano Sabatini
This is a port of the kerndeint filter (libmpcodecs/vf_kerndeint) by Donal A. Graft (original avisynth plugin author), and is based on the work by Jérémy Tran <tran.jeremy.av@gmail.com> done for SOCIS 2012.
2012-12-29lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: cosmetics: Prettyprint codec/format/filter registration files Conflicts: libavcodec/allcodecs.c libavdevice/alldevices.c libavfilter/allfilters.c libavformat/allformats.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-29Merge commit '69583bd3b1eba471366141c945030c163e073e02'Michael Niedermayer
* commit '69583bd3b1eba471366141c945030c163e073e02': avfilter: Refactor unconditional filter registration build: Add rtpenc_chain extra config option configure: Add --disable-all command line option Conflicts: libavfilter/allfilters.c libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-28cosmetics: Prettyprint codec/format/filter registration filesDiego Biurrun
2012-12-28avfilter: Refactor unconditional filter registrationDiego Biurrun
2012-12-24Merge commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00'Michael Niedermayer
* commit '3193b13aa1e271f6d2dd68de67d448c08aef3c00': hlsenc: Allocate enough space for the pattern string lavc: Correct the description of pkt_dts avfilter: Compile FIFO filters unconditionally Conflicts: libavcodec/avcodec.h libavfilter/Makefile libavfilter/allfilters.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-23lavfi: add pp filter.Clément Bœsch
Ported from MPlayer. Original author is A'rpi, with various contributions from Michael Niedermayer. The original documentation was mostly written by Diego Biurrun. See the MPlayer history for full credits. The filter is under GPL like the original filter, even if it differs quite a lot. There is not much point in making it LGPL since pp is under GPL.
2012-12-23avfilter: Compile FIFO filters unconditionallyDiego Biurrun
Building libavfilter without that functionality makes little sense.
2012-12-18avfilter: add apad filterMichael Niedermayer
This filter pads an audio stream with silence It can together with -shortest be used to extend audio streams to the same length as video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-13lavfi: add aselect audio variant of selectStefano Sabatini
2012-12-08lavfi: drop af_volume_stefano.c in favor of af_volume_justin.cStefano Sabatini
Justin's version has more features but is otherwise equivalent from the point of view of the syntax.
2012-12-06Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'Michael Niedermayer
* commit 'b384e031daeb1ac612620985e3e5377bc587559c': lavfi: add volume filter Conflicts: Changelog libavfilter/Makefile libavfilter/af_volume.c libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05lavfi: add volume filterJustin Ruggles
Based on the volume filter in FFmpeg written by Stefano Sabatini <stefasab@gmail.com>.
2012-12-04lavfi: add subtitles filter.Clément Bœsch
2012-11-29Merge commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc'Michael Niedermayer
* commit 'bb6c67bb36b136de10256f0999128df4a42f9ffc': lavfi: remove vf_slicify Conflicts: doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c libavfilter/vf_slicify.c tests/lavfi-regression.sh tests/ref/lavfi/crop_scale_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-28lavfi: remove vf_slicifyAnton Khirnov
The following commit will make it useless. The crop_scale_vflip FATE test changes because of off-by-one differences in output when vflipped slices are passed to sws.
2012-11-12lavfi: add geq filter.Clément Bœsch
2012-10-31lavfi: add field filterStefano Sabatini
The filter is a port of libmpcodecs/vf_field.c, since there is no common code I relicensed it as LGPL, while keeping the original author copyright.
2012-10-30lavfi: add ashowinfo filterAnton Khirnov
It can be useful for debugging. Based on a patch by Stefano Sabatini <stefano.sabatini-lala@poste.it>
2012-10-02lavfi: EBU R.128 scanner.Clément Bœsch
2012-09-27lavfi: enable buffersinks unconditionally.Nicolas George
They are part of the public API. Their libav compatibility counterpart are already enabled unconditionally.
2012-09-23lavfi: add asendcmd and sendcmd filtersStefano Sabatini
2012-09-01libavfilter: Support the forks ABI for buffer sinksMichael Niedermayer
With this change avconv compiled against libav and linked to ffmpegs libs will run through the whole fate testsuite without any crashes. 857 tests pass, the remaining tests fail one way or another, which is to be expected as avconv is not a drop in replacement for ffmpeg The testsuite used was the ffmpeg fate testsuite, not libavs. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-31lavfi: port decimate libmpcodecs filterStefano Sabatini
This filter is based on the MPlayer decimate filter by Rich Felker.
2012-08-28lavfi: add smartblur filterJérémy Tran
This is a port of the MPlayer smartblur filter (libmpcodecs/vf_smartblur.c) by Michael Niedermayer. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-08-21lavfi: add showspectrum filter.Clément Bœsch
2012-08-19lavfi: add volumedetect filter.Nicolas George
2012-08-18lavfi: add framestep filterStefano Sabatini
This filter is inspired upon libmpcodecs/vf_framestep.c, by Daniele Forghieri. Only-keyframe output is not supported, since that feature can be achieved through the more versatile select filter.
2012-08-17lavfi: add edgedetect filter.Clément Bœsch
2012-08-16Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-15Don't include common.h from avutil.hMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-13lavfi: add hue filterJérémy Tran
This is a port of the MPlayer hue filter (libmpcodecs/vf_hue.c) by Michael Niedermayer. Signed-off-by: Jérémy Tran <tran.jeremy.av@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-08-09lavfi: add asetpts audio filterStefano Sabatini
Based on an idea by Andrey Utkin <andrey.krieger.utkin@gmail.com>.
2012-08-07lavfi: add smptebars sourcePaul B Mahol
Patch readapted by Stefano Sabatini, color values proposed by Tim Nicholson <nichot20@yahoo.com>. Address trac ticket #1462. See thread: Subject: [FFmpeg-devel] [PATCH] smptebars filter Date: Wed, 20 Jun 2012 01:54:58 +0000 Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-07-28lavfi: add flite audio sourceStefano Sabatini
2012-07-28lavfi: move movie and amovie to a "multimedia sources" sectionStefano Sabatini
Since the recent changes, movie and amovie are able to deal with more than one type of stream, so they should be categorized as "multimedia sources" rather than audio/video sources.
2012-07-23lavfi: change "transmedia" into "multimedia".Nicolas George
2012-07-23lavfi: add concat filter.Nicolas George
2012-07-22lavfi: add alphaextract and alphamerge filtersSteven Robertson
These filters are designed for storing and transmitting video sequences with alpha using higher-efficiency codecs such as x264 which don't natively support an alpha channel. 'alphaextract' takes an input stream with an alpha channel and returns a video containing just the alpha component as a grayscale value; 'alphamerge' takes an RGB or YUV stream and adds an alpha channel recovered from a second grayscale stream. Signed-off-by: Steven Robertson <steven@strobe.cc> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
2012-07-08lavfi: implement asettb filter.Nicolas George