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-05-03extractplanes filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-03Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'Michael Niedermayer
* commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521': matroskaenc: add an option to put the index at the start of the file Conflicts: doc/muxers.texi libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03matroskaenc: add an option to put the index at the start of the fileAnton Khirnov
2013-05-01Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'Michael Niedermayer
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a': avconv: make output -ss insert trim/atrim filters. Conflicts: Changelog ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'Michael Niedermayer
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2': avconv: make -t insert trim/atrim filters. The filter insertion code is merged but disabled as it is buggy. For example it fails in various ways when used with -s with some files. Also the trimming is arguably less accurate than the default without filters in some cases. These issues should be fixed before auto inserting the filters, until then the user can explicitly add a trim/atrim filter when one is wanted. Conflicts: Changelog ffmpeg.c ffmpeg_filter.c tests/ref/fate/bethsoft-vid tests/ref/lavf/aiff tests/ref/lavf/asf tests/ref/lavf/au tests/ref/lavf/avi tests/ref/lavf/dpx tests/ref/lavf/ffm tests/ref/lavf/gxf tests/ref/lavf/jpg tests/ref/lavf/mkv tests/ref/lavf/mmf tests/ref/lavf/mov tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/pcx tests/ref/lavf/png tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/lavf/voc tests/ref/lavf/voc_s16 tests/ref/lavf/wav Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876'Michael Niedermayer
* commit 'a1e05b0487a1939334c2920fc7f9936bc9efe876': lavfi: add trim and atrim filters. Conflicts: Changelog doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-30avconv: make output -ss insert trim/atrim filters.Anton Khirnov
This makes output -ss sample-accurate for audio and will allow further simplication in the future.
2013-04-30avconv: make -t insert trim/atrim filters.Anton Khirnov
This makes -t sample-accurate for audio and will allow further simplication in the future. Most of the FATE changes are due to audio now being sample accurate. In some cases a video frame was incorrectly passed with the old code, while its was over the limit.
2013-04-30lavfi: add trim and atrim filters.Anton Khirnov
2013-04-30lavfi: add an asetpts filterAnton Khirnov
2013-04-27astats filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-24lavfi: add video stabilization plugins using vid.stab libraryGeorg Martius
vidstabdetect and vidstabtransform common functions for interfacing vid.stab are in libavfilter/vidstabutils.c Signed-off-by: Georg Martius <martius@mis.mpg.de>
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-22JPEG 2000 decoder for DCinemaNicolas Bertrand
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl> Updated to current programming standards, style and many more small fixes by Diego Biurrun <diego@biurrun.de>. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-21lavfi: add interleave filtersStefano Sabatini
2013-04-21lavfi: add asetrate filter.Nicolas George
2013-04-20Changelog: notify GIF improvements.Clément Bœsch
2013-04-19subtitles: introduce ASS codec id and use it.Clément Bœsch
Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
2013-04-18colorchannelmixer filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-18colorbalance filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-14lavfi: port IVTC filters from vapoursynth.Clément Bœsch
2013-04-14lavfi: add smptehdbars sourcePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: FATE: add a test for the interlace filter lavfi: new interlace filter Conflicts: Changelog configure doc/filters.texi libavfilter/Makefile libavfilter/allfilters.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11lavfi: new interlace filterVittorio Giovara
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11telecine filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-11Merge commit '2e81acc687e64d15dd93c74793060bb5a233f44d'Michael Niedermayer
* commit '2e81acc687e64d15dd93c74793060bb5a233f44d': x86inc: Fix number of operands for cmp* instructions af_channelmap: fix uninitialized variable use introduced in ba8efac977f4276f05274947b2b67d144cbc965a lavfi: add a bump and docs entries for the AVOptions switch Conflicts: Changelog doc/APIchanges libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-10lavf: add libquvi demuxer.Clément Bœsch
2013-04-10separatefields filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-09lavfi: add a bump and docs entries for the AVOptions switchAnton Khirnov
2013-04-03aphaser filterPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-01Changelog: add entry for OpenCLMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28avconv: add options for reading filtergraphs from a file.Anton Khirnov
2013-03-23Changelog: add WebPMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21lavfi: add sine audio source.Nicolas George
2013-03-19changelog: 10% faster aac encoding on x86 and MIPSCompn
2013-03-17ffplay: add -af optionMarton Balint
Based on a patch by Stefano Sabatini <stefasab@gmail.com>: http://ffmpeg.org/pipermail/ffmpeg-devel/2013-February/138452.html Signed-off-by: Marton Balint <cus@passwd.hu>
2013-03-16lavfi: add perms and aperms filters.Clément Bœsch
2013-03-16changelog: add support for Monkey's Audio versions from 3.93Compn
2013-03-13Changelog: fix project nameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'Michael Niedermayer
* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'Michael Niedermayer
* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10lavfi: add curves filter.Clément Bœsch
2013-03-08avconv: do not silently ignore unused codec AVOptions.Anton Khirnov
Print an error and abort when the option is of the wrong type (decoding for output file or vice versa), since this could never be correct for any input or output configuration. Print a warning and continue when the option is of the correct type, just unused, so same commandlines can be reused for different kinds of input or output files.
2013-03-08Add the bumps and APIchanges entries for reference counted buffers changes.Anton Khirnov
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-17lavc: support subtitles character encoding conversion.Clément Bœsch
2013-02-17Changelog: Add entry for encrypted TTA stream decodingJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-16Changelog: add missing empty line after the version lineStefano Sabatini