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-03-15doc/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> (cherry picked from commit 5336cd6374c7cbba9d6e65de1cec9404efcb665f) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15Merge commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3' into release/2.2Michael Niedermayer
* commit '2b9ee7d5b901e0d7ba617511e4ed31d3043894d3': 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> (cherry picked from commit 908836e20743d7e9462011a9f30a300a5bf247ca)
2014-03-07Revert "Add libx265 encoder"Reinhard Tartler
cf. the discussion following https://lists.libav.org/pipermail/libav-devel/2014-March/056894.html This reverts commit 50ea93158d4c480f64069e8bd1da388486dcf4ba. Conflicts: doc/general.texi libavcodec/version.h
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.
2013-11-01Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'Michael Niedermayer
* commit '5846646296e377e093441dfe9eadde38ff1f7c99': Add raw HEVC demuxer Conflicts: Changelog libavformat/hevcdec.c libavformat/version.h See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'Michael Niedermayer
* commit '064698d381e1e7790f21b0199a8930ea04e2e942': Add HEVC decoder Conflicts: Changelog libavcodec/Makefile libavcodec/allcodecs.c libavcodec/hevc.c libavcodec/hevc.h libavcodec/hevc_cabac.c libavcodec/hevc_filter.c libavcodec/hevc_mvs.c libavcodec/hevc_parser.c libavcodec/hevc_ps.c libavcodec/hevc_refs.c libavcodec/hevc_sei.c libavcodec/hevcdsp.c libavcodec/hevcdsp_template.c libavcodec/hevcpred.c libavcodec/hevcpred_template.c libavcodec/version.h cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'Michael Niedermayer
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e': HNM4/HNM4A demuxer & video decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/version.h libavformat/Makefile libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-31Add raw HEVC demuxerDirk Farin
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31Add HEVC decoderGuillaume Martres
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC project. Further contributions by the OpenHEVC project and other developers, namely: Mickaël Raulet <mraulet@insa-rennes.fr> Seppo Tomperi <seppo.tomperi@vtt.fi> Gildas Cocherel <gildas.cocherel@laposte.net> Khaled Jerbi <khaled_jerbi@yahoo.fr> Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr> Vittorio Giovara <vittorio.giovara@gmail.com> Jan Ekström <jeebjp@gmail.com> Anton Khirnov <anton@khirnov.net> Martin Storsjö <martin@martin.st> Luca Barbato <lu_zero@gentoo.org> Yusuke Nakamura <muken.the.vfrmaniac@gmail.com> Reimar Döffinger <Reimar.Doeffinger@gmx.de> Diego Biurrun <diego@biurrun.de> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-31HNM4/HNM4A demuxer & video decoderDavid Kment
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-03Native VP9 decoder.Ronald S. Bultje
Authors: Ronald S. Bultje <rsbultje gmail com>, Clement Boesch <u pkh me>
2013-09-27pcm: support 24-bit/32-bit little-endian planarPaul B Mahol
Used by LXF. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-19Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'Michael Niedermayer
* commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff': Add a WebP decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h libavformat/img2.c The previously existing webp decoder is disabled as the new one supports lossless mode and alpha while the previous does not. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-18Add a WebP decoderJustin Ruggles
Container and lossy decoding by Aneesh Dogra <aneesh@sugarlabs.org> Lossless decoding by Justin Ruggles <justin.ruggles@gmail.com>
2013-09-11Merge commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c'Michael Niedermayer
* commit 'ec17d1aa8b833d49d8fc479e44e9e22858aa486c': doc: Drop VDPAU from list of supported codecs Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10doc: Drop VDPAU from list of supported codecsDiego Biurrun
2013-09-03Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'Michael Niedermayer
* commit '7df9e693a34c84c698da60426c78140c950f95ed': cosmetics: Fix ATRAC codec name spelling Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-02cosmetics: Fix ATRAC codec name spellingDiego Biurrun
2013-09-02lavc: add teletext decoder using libzvbiMarton Balint
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>. Lots of additional features and fixes are made by me. Fixes ticket #2086. Changes since last version: - change default page to all pages Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14WavPack encoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-08Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer
* commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-08Voxware MetaSound decoderKostya Shishkov
2013-07-30Merge commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8'Michael Niedermayer
* commit '0e8c6f221a8ddb7dfb3c9e9bd0b33cb12e9391b8': avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typo Conflicts: doc/general.texi libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-29avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typoDiego Biurrun
Also fix some similar typos in comments and documentation.
2013-06-18lavf: add WebVTT muxer.Matthew Heaney
This revision creates a WebVTT muxer, that outputs files having the format described in the following specification: http://dev.w3.org/html5/webvtt/
2013-06-14doc/general: Make the license status of the Android libraries clearerTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-12doc/general: s/Libav/FFmpegPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-11Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lavc: add a libwavpack encoder wrapper Conflicts: Changelog doc/encoders.texi libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-10lavc: add a libwavpack encoder wrapperAnton Khirnov
2013-06-05doc/general: update after e4e4add0e3ba7Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-06-03Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'Michael Niedermayer
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c': Go2Webinar decoder Conflicts: Changelog configure libavcodec/avcodec.h libavcodec/codec_desc.c libavcodec/version.h libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03Go2Webinar decoderKostya Shishkov
2013-06-02tta encoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23s302m encoderDarryl Wallace
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-05-23doc/general: remove obsolete info about APE decoderPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>