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-06-01Merge commit '0957b274e312e985d69cb490bee2a7ff820acaa6'Michael Niedermayer
* commit '0957b274e312e985d69cb490bee2a7ff820acaa6': lavc: add an option to enable side data-only packets during encoding Conflicts: libavcodec/avcodec.h libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01lavc: add an option to enable side data-only packets during encodingAnton Khirnov
Some encoders (e.g. flac) need to send side data when there is no more data to be output. This enables them to output a packet with no data in it, only side data.
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-23Merge commit '21f68c2489cba2a1a4a41d0c5c828266e6162800'Michael Niedermayer
* commit '21f68c2489cba2a1a4a41d0c5c828266e6162800': avcodec: bump version after rotation api Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-23avcodec: bump version after rotation apiVittorio Giovara
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
2014-05-18Merge commit 'fd056029f45a9f6d213d9fce8165632042511d4f'Michael Niedermayer
* commit 'fd056029f45a9f6d213d9fce8165632042511d4f': lavc: add avcodec_free_context(). Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-18lavc: add avcodec_free_context().Anton Khirnov
Right now, the caller has to manually manage some allocated AVCodecContext fields, like extradata or subtitle_header. This is fragile and prone to leaks, especially if we want to add more such fields in the future. The only reason for this behaviour is so that the AVStream codec context can be reused for decoding. Such reuse is discouraged anyway, so this commit is the first step to deprecating it.
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-14avcodec/libx264: Implement reference frame count limiting based on levelMichael Niedermayer
This makes libavcodec/libx264.c behave more similar to the x264 command line util Fixes Ticket3307 Implementation based on x264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-13avcodec: add option to make is_intra_more_likely() from error concealment ↵Michael Niedermayer
return "no" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit 'ba71c74017c287681153ec8f6f1cba650d797275'Michael Niedermayer
* commit 'ba71c74017c287681153ec8f6f1cba650d797275': lavc: deprecate AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'Michael Niedermayer
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d': lavc: move CODEC_FLAG_MV0 to mpegvideo Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'Michael Niedermayer
* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400': lavc: make the xvid-specific "gmc" flag a private option of libxvid Conflicts: libavcodec/libxvid.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'Michael Niedermayer
* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683': lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01Merge commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd'Michael Niedermayer
* commit '5fccedaa67390ccddd6347c8e1c71b7664558bcd': lavc: deprecate CODEC_FLAG_INPUT_PRESERVED Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01lavc: deprecate AVCodecContext.codec_nameAnton Khirnov
It is undocumented and has no real use.
2014-05-01lavc: move CODEC_FLAG_MV0 to mpegvideoAnton Khirnov
2014-05-01lavc: make the xvid-specific "gmc" flag a private option of libxvidAnton Khirnov
2014-05-01lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideoAnton Khirnov
2014-05-01lavc: deprecate CODEC_FLAG_INPUT_PRESERVEDAnton Khirnov
The addition of reference-counted frames makes it pointless.
2014-04-29lavc: minor bump and APIchanges for AVCodecDescriptor.mime_types.Nicolas George
The minor bump also covers AV_CODEC_ID_BIN_DATA.
2014-04-29Merge commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05'Michael Niedermayer
* commit 'ed4b757177f9b563412cdbc8ee3405d82e10fc05': dxva2_h264: add a workaround for old Intel GPUs Conflicts: doc/APIchanges libavcodec/version.h See: 8b2a130d3fe61e348092714dffa425b63c4d796c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-28dxva2_h264: add a workaround for old Intel GPUsHendrik Leppkes
Old Intel GPUs expect the reference frame index to the actual surface, instead of the index into RefFrameList as specified by the spec. This workaround should be set when using one of the "ClearVideo" decoder devices. Signed-off-by: Anton Khirnov <anton@khirnov.net>
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 '86a0432688216562926d4aee36118f01be6d5e1b'Michael Niedermayer
* commit '86a0432688216562926d4aee36118f01be6d5e1b': Silicon Graphics Motion Video Compressor 1 & 2 decoder Conflicts: Changelog libavcodec/avcodec.h libavcodec/mvcdec.c libavcodec/version.h See: 746b1dcc98b466e4abd301f304127583722ad80b Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 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-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 'c389a804943095ebf078daec6b64690d2c97069c'Michael Niedermayer
* commit 'c389a804943095ebf078daec6b64690d2c97069c': libxvid: Add SSIM displaying through a libxvidcore plugin Conflicts: libavcodec/libxvid.c libavcodec/version.h See: 3b3c1ed0768af874c624cc555fbbd1fcea370200 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07Merge commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1'Michael Niedermayer
* commit '5ce7ca68b86856ee8e9d6530dffdadc4eca4f8d1': libxvid: add working lumimasking and variance AQ Conflicts: libavcodec/libxvid.c libavcodec/version.h See: ccb212b6c3ed18c9ff4e0c982574c43f92657f9f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-07libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-04-07libxvid: add working lumimasking and variance AQTimothy Gu
The old implementation is unusable due to changes in the Xvid API. Further fixes by Michael Niedermayer <michaelni@gmx.at>. 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 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-06Consider aspect ratio when writing tiff dpi.Carl Eugen Hoyos
TIFFTAG_YRESOLUTION gets now adjusted to sample_aspect_ratio.
2014-04-05lavc/exif: Make EXIF IFD decoding part of private API/ABI.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04Merge commit 'ac4b32df71bd932838043a4838b86d11e169707f'Michael Niedermayer
* commit 'ac4b32df71bd932838043a4838b86d11e169707f': On2 VP7 decoder Conflicts: Changelog libavcodec/arm/h264pred_init_arm.c libavcodec/arm/vp8dsp.h libavcodec/arm/vp8dsp_init_arm.c libavcodec/arm/vp8dsp_init_armv6.c libavcodec/arm/vp8dsp_init_neon.c libavcodec/avcodec.h libavcodec/h264pred.c libavcodec/version.h libavcodec/vp8.c libavcodec/vp8.h libavcodec/vp8data.h libavcodec/vp8dsp.c libavcodec/vp8dsp.h libavcodec/x86/h264_intrapred_init.c libavcodec/x86/vp8dsp_init.c See: 89f2f5dbd7a23e7ec1073d3c08d46093a01a4135 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>
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-01Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'Michael Niedermayer
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b': OpenEXR decoder Conflicts: Changelog configure libavcodec/Makefile libavcodec/avcodec.h libavcodec/exr.c libavcodec/version.h Merged-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-31Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: libmp3lame: add ABR support Conflicts: libavcodec/libmp3lame.c libavcodec/version.h See: d3211cfaedcc0abf30e3a40c246237090ad95b6d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'Michael Niedermayer
* commit '729d821fd864a0568f4068e64d3a70faa23b9309': libmp3lame: allow joint stereo to be disabled Conflicts: libavcodec/libmp3lame.c libavcodec/version.h See: 1de11a7cab5346030a134774fbc23b3fc523a003 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-31libmp3lame: add ABR supportTimothy Gu