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-05-31Fix compilation with --disable-everything --enable-demuxer=matroska.Carl Eugen Hoyos
Fixes ticket #3693.
2014-05-30Merge commit '368f50359eb328b0b9d67451f56fda20b3255f9a'Michael Niedermayer
* commit '368f50359eb328b0b9d67451f56fda20b3255f9a': dsputil: Split off quarterpel bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/vc1dec.c libavcodec/vc1dsp.c libavcodec/x86/dsputil_init.c libavcodec/x86/qpeldsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29dsputil: Split off quarterpel bits into their own contextDiego Biurrun
2014-05-28Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'Michael Niedermayer
* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c': dsputil: Split off HuffYUV encoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvenc.c libavcodec/pngenc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'Michael Niedermayer
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d': dsputil: Split off HuffYUV decoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvdec.c libavcodec/lagarith.c libavcodec/vble.c libavcodec/x86/Makefile libavcodec/x86/dsputil.asm libavcodec/x86/dsputil_init.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27dsputil: Split off HuffYUV encoding bits into their own contextDiego Biurrun
Also shorten HuffYUV context member names to avoid clutter.
2014-05-27dsputil: Split off HuffYUV decoding bits into their own contextDiego Biurrun
Also shorten HuffYUV context member names to avoid clutter.
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-05-20check: add libavcodec/vda_internal.h to SKIPHEADERS-$(CONFIG_VDA)Janne Grunau
2014-05-15Fix make checkheaders if VDA is not available.Carl Eugen Hoyos
2014-05-15Merge commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222'Michael Niedermayer
* commit 'b70d7a4ac72d23f3448f3b08b770fdf5f57de222': lavc: add a native Opus decoder. Conflicts: Changelog configure libavcodec/version.h Fate tests pass with both avresample as well as swresample based opus decoder, but are disabled (reference files are very large so i want to think a day or 2 about if theres an alternative or if they could be avoided, they also dont match the official samples) Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15lavc: add a native Opus decoder.Anton Khirnov
Initial implementation by Andrew D'Addesio <modchipv12@gmail.com> during GSoC 2012. Completion by Anton Khirnov <anton@khirnov.net>, sponsored by the Mozilla Corporation. Further contributions by: Christophe Gisquet <christophe.gisquet@gmail.com> Janne Grunau <janne-libav@jannau.net> Luca Barbato <lu_zero@gentoo.org>
2014-05-14Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer
* commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13build: handle library dependencies in configureJanne Grunau
Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
2014-05-12Merge commit '67afcefb35932b420998f6f3fda46c7c85848a3f'Michael Niedermayer
* commit '67afcefb35932b420998f6f3fda46c7c85848a3f': lavc: Add new VDA hwaccel Conflicts: configure libavcodec/vda.h libavcodec/vda_h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-11lavc: Add new VDA hwaccelAnton Khirnov
It leverages the new hwaccel 1.2 features: - get_buffer2 is never called - the internal context is automatically initialized/deinitialized Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-03Fix standalone compilation of dsd planar decoders.Carl Eugen Hoyos
2014-05-03Fix oga muxer standalone compilation.Carl Eugen Hoyos
2014-04-25vc-1: Add platform-specific start code search routine to VC1DSPContext.Ben Avison
Initialise VC1DSPContext for parser as well as for decoder. Note, the VC-1 code doesn't actually use the function pointer yet. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-25h264: Move search code search functions into separate source files.Ben Avison
This permits re-use with parsers for codecs which use similar start codes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-19Silicon Graphics Motion Video Compressor 1 & 2 decoderPeter 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-15Direct Stream Digital (DSD) decoderPeter Ross
Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-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-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-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-28bmp: add a standalone parserPaul B Mahol
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-24Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'Michael Niedermayer
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834': build: Add config option for CABAC code Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24build: Add config option for CABAC codeDiego Biurrun
This allows for more elegant dependency and object declarations.
2014-03-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: h264: Split h264 slice decoding from nal decoding Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0'Michael Niedermayer
* commit 'e9a77f4bc084e5174baba3a8bc869ce4d102c4f0': h264: move macroblock decoding into its own file Conflicts: libavcodec/Makefile libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4'Michael Niedermayer
* commit 'ede2b451ccb1b2317858c7a32784a9b739ba45f4': build: Sort h264 objects Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'Michael Niedermayer
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d': build: h264 parser depends on full h264 decoder Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24h264: Split h264 slice decoding from nal decodingLuca Barbato
2014-03-24h264: move macroblock decoding into its own fileVittorio Giovara
2014-03-24build: Sort h264 objectsLuca Barbato
2014-03-24build: h264 parser depends on full h264 decoderLuca Barbato