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
2014-07-13lavf: add samba protocol via libsmbclientLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-13AVFormat: LRC demuxer and muxerStar Brilliant
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25avcodec/webvttenc: add webvtt encoderAman Gupta
Based off the srt encoder. The following features are unimplemented: - fonts, colors, sizes - alignment and positioning The rest works well. For example, use ffmpeg to convert subtitles into the .vtt format: ffmpeg -i input.srt output.vtt Signed-off-by: Aman Gupta <ffmpeg@tmm1.net> Signed-off-by: Clément Bœsch <u@pkh.me>
2014-04-23Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'Michael Niedermayer
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd': On2 AVC decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-23On2 AVC decoderKostya Shishkov
2014-04-19Merge commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee'Michael Niedermayer
* commit '07761294fc3f08e139e8a406ef7d5b63aaf1ecee': Silicon Graphics RLE 8-bit video decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/sgirledec.c libavcodec/version.h See: afa1617b937f3675f74c6351a46c45f8c24d67f2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19Silicon Graphics Movie demuxerPeter Ross
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19Silicon Graphics RLE 8-bit video decoderPeter Ross
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19Silicon Graphics Motion Video Compressor 1 & 2 decoderPeter Ross
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-19Magic Lantern Video (MLV) demuxerPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-18DSD Stream File (DSF) demuxerPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-15Direct Stream Digital (DSD) decoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-09Merge commit '718907cd881a0b593264aed059c0e00da13f9e15'Michael Niedermayer
* commit '718907cd881a0b593264aed059c0e00da13f9e15': libtwolame MP2 encoding support Conflicts: Changelog configure doc/general.texi libavcodec/Makefile libavcodec/libtwolame.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-08libtwolame MP2 encoding supportPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-07Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'Michael Niedermayer
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89': LucasArts SMUSH VIMA audio decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavcodec/vima.c This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition to the previously used name "vima" These changes are needed for compatibility with the renamed codec in libav See: b18357326ca1522d7fb7f4276ddebfccc29ce72c and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'Michael Niedermayer
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2': LucasArts SMUSH SANM video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/sanm.c libavcodec/version.h See: 69254f46286099588514454f60fad12f6e51b2cd and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-06LucasArts SMUSH demuxerPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06LucasArts SMUSH VIMA audio decoderPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-06LucasArts SMUSH SANM video decoderPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-04On2 VP7 decoderPeter Ross
Further performance improvements and security fixes by Vittorio Giovara, Luca Barbato and Diego Biurrun. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-04-03Add Win32 GDI-based screen grabbingCalvin Walton
Based on original code by Christophe Gisquet in 2010, updated to work with current ffmpeg APIs. Supports grabbing a single window or an area of the screen, including support for multiple monitors (Windows does funky stuff with negative coordinates here). I've moved most of the configuration to AVOptions; the input file name is now only the string "desktop", or "title=<windowname>" to select a single window. The AVOptions are the same as x11grab where possible. Code has been added to support a "show_region" mode, like x11grab, which will draw a rectangle on the screen around the area being captured. Instead of duplicating code for paletted image handling, I make use of the GDI API's ability to output DIB (BMP) images, which can be run through ffmpeg's existing BMP decoder. Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01libavcodec: Implementation of AC3 fixedpoint decoderNedeljko Babic
Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01OpenEXR decoderJimmy Christensen
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-28Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'Michael Niedermayer
* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033': PAF demuxer and decoder Conflicts: Changelog doc/general.texi libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/paf.c libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/paf.c libavformat/version.h See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28X-Bitmap decoderVittorio Giovara
2014-03-28PAF demuxer and decoderPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-03-28Merge commit 'ae17878fb2ab100264226c84c58f5b95a703312f'Michael Niedermayer
* commit 'ae17878fb2ab100264226c84c58f5b95a703312f': BRender PIX image decoder Conflicts: doc/general.texi libavcodec/Makefile libavcodec/version.h See: 492a5f835c59ab7c2e347d3579d8bf6148ae0a0, and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27BRender PIX image decoderAleksi Nurmi
Further enhancements by Vittorio Giovara and Paul B Mahol. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-27Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'Michael Niedermayer
* commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder Conflicts: Changelog libavcodec/allcodecs.c libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-27Alias PIX image encoder and decoderVittorio Giovara
2014-03-25On2 VP7 decoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Reviewed-by: BBB previous patch reviewed by jason Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Phantom Cine demuxer (iteration 2014.3)Peter Ross
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12doc/general.texi: Adjust the notes on AviSynthStephen Hutchinson
FFmpeg provides local copies of these headers in compat/avisynth/, and there is no restriction against using 2.5. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: doc: Add section about AviSynth support Conflicts: doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11doc: Add section about AviSynth supportStephen Hutchinson
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-02-17doc: Fix project name typoDiego Biurrun
2014-02-12Add libx265 encoderDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-12Add libx265 encoderDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-02-08Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Mirillis FIC video decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08Mirillis FIC video decoderKostya Shishkov
Does not contain cursor rendering yet. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2014-01-28doc/general: update device and protocol statusLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-09ATRAC3+ decoderMaxim Polijakowski
Cleanup by Diego Biurrun. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2013-12-29ATRAC+ decoderMaxim Poliakovski
Cleanup by Diego Biurrun. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'Michael Niedermayer
* commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b': Add a libwebp encoder Conflicts: Changelog doc/encoders.texi doc/general.texi libavcodec/version.h libavformat/img2enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22Add a libwebp encoderJustin Ruggles
2013-11-26Merge commit '56d061ce9da954560892e3551513d5ecc0439846'Michael Niedermayer
* commit '56d061ce9da954560892e3551513d5ecc0439846': metasound: add last missing modes (8kHz @ 6kbps per channel) Conflicts: Changelog doc/general.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-26metasound: add last missing modes (8kHz @ 6kbps per channel)Kostya Shishkov
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-15lavc: VP9 decoderRonald S. Bultje
Originally written by Ronald S. Bultje <rsbultje@gmail.com> and Clément Bœsch <u@pkh.me> Further contributions by: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-11-14Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Deprecate obsolete XvMC hardware decoding support Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12dec.c libavcodec/mpegvideo.c libavcodec/options_table.h libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14Deprecate obsolete XvMC hardware decoding supportDiego Biurrun
XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.