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
2017-03-24Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'Clément Bœsch
* commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea': nut: Drop pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
2016-10-27nut: Drop pointless TRACE level debug codeDiego Biurrun
The code has little usefulness and uses the __PRETTY_FUNCTION__ GNU extension.
2016-04-10Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis
* commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-03avformat: use ff_standardize_creation_time for formats writing all format ↵Marton Balint
string metadata Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2016-02-29Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'Derek Buitenhuis
FATE tests have been updated to patch. They do not differ in any meaningful way. * commit 'dc6527ed908e4d330738f139074455ffbe56a2de': nutenc: do not use AVCodecContext.frame_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-23lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov
Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
2016-02-22nutenc: do not use AVCodecContext.frame_sizeAnton Khirnov
It will in general not be available. Use block_align if known or fall back to av_get_audio_frame_duration().
2016-01-21avformat/nutenc: implement deinit()Michael Niedermayer
Should prevent some leaks if header writing fails Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch
2015-11-02nut: Use the correct codec_tag when multiple are availableLuca Barbato
Some codecs use the codec_tag to signal specific information and picking the first one would lead to a broken file. Bug-Id: 883 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-10-25avutil/tree: add additional const qualifier to the comparatorGanesh Ajjanagadde
libc's qsort comparator has a const qualifier on both arguments. This adds a missing const qualifier to exactly match the comparator API. Existing usages of av_tree_find, av_tree_insert are appropriately modified: type signature changes of the comparators, and removal of unnecessary void * casts of function pointers. Reviewed-by: Henrik Gramner <henrik@gramner.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-07-25avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.Michael Niedermayer
This side data does not serve or improve decoding the data, it thus would semantically be metadata and not side data. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-05-10avformat/nutenc: Fix writing strings larger than 2gbMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'Michael Niedermayer
* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a': libavformat: Use ffio_free_dyn_buf where applicable Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25libavformat: Use ffio_free_dyn_buf where applicableMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-06nutdec: Remove unused variablesTimothy Gu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27Merge commit '80a11de7dca315505bf203ce9c8c016e71724fd2'Michael Niedermayer
* commit '80a11de7dca315505bf203ce9c8c016e71724fd2': nutenc: do not use has_b_frames Conflicts: libavformat/nutenc.c tests/ref/lavf/nut tests/ref/seek/lavf-nut Mostly not merged, this is simply not correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27nutenc: do not use has_b_framesAnton Khirnov
It is unreliable, especially when the stream codec context is not the encoding context. Use the codec descriptor properties instead.
2014-12-14avformat/nutenc: store the actual r_frame_rate in the corresponding field if ↵Michael Niedermayer
available Fixes Ticket 3629 part3 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'Michael Niedermayer
* commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba': nutenc: check for negative index rather than assert Conflicts: libavformat/nutenc.c Not merged, the assert is correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-21nutenc: check for negative index rather than assertVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 703721
2014-06-18Merge commit 'd754ed41727b1fcbab335b510248a9758a73320c'Michael Niedermayer
* commit 'd754ed41727b1fcbab335b510248a9758a73320c': riffenc: take an AVStream instead of an AVCodecContext Conflicts: libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18riffenc: take an AVStream instead of an AVCodecContextAnton Khirnov
It will be useful in the following commits. Also, rename the AVCodecContext pointer name from 'stream' to 'codec'.
2014-06-10avformat/nutenc: cleaner version checkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10avformat/nutenc: Fix error handling in nut_write_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10avformat/nutenc: Fix error handling in write_sm_data()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-30avformat/nutenc: Suggest genpts if AV_NOPTS_VALUEMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: replace conditional by assertMichael Niedermayer
Its implied by sp_count==0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: limit index table size if no index is going to be writtenMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: add mode that omits the indexMichael Niedermayer
When the index is not written, several data tables become unneeded, reducing memory and cpu requirements. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29nutenc: avoid av_tree_find() operation per syncpointMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: bump minor version due to broadcast/pipeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: change check to match commentMichael Niedermayer
The code appears to assume STABLE will never change Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29avformat/nutenc: fix used version valueMichael Niedermayer
The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based on which is stable Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873'Michael Niedermayer
* commit 'c94e2e85cb6af8a570d8542a830556243bd32873': nut: Support experimental NUT 4 features Conflicts: doc/nut.texi libavformat/nut.h libavformat/nutdec.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-29nut: Support experimental NUT 4 featuresLuca Barbato
Add the low overhead pipe mode and the extended broadcast mode. Export the options as 'syncponts' since it impacts only that. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-18avformat/nutenc: switch to AVFMT_FLAG_BITEXACTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24avformat/nutenc: fix missing break in switchMichael Niedermayer
Fixes CID1163848 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-04avformat/nut: add support for per frame side & meta data with version 4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-25avformat/nut: add minor_version field with version>=4Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-25avformat/nut: store version in the contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-22nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and ↵Michael Niedermayer
discard the 2nd This fixes an assertion failure and regression and restores previous behaviour Fixes Ticket3197 An alternative would be to fail hard in this case and refuse to mux such data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Add missing #includes for *INT64_MAX and *INT64_CDiego Biurrun
2013-10-22nut: Fix unchecked allocationsDerek Buitenhuis
CC: libav-stable@libav.org Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-10-22nut: Fix unchecked allocationsDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2013-09-14avformat/nutenc: use av_reallocp_array()Paul B Mahol
Fixes memleak on allocation error. Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-09-14avformat/nutenc: use av_calloc()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-28Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'Michael Niedermayer
* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d': Remove unreachable returns Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-27Remove unreachable returnsDiego Biurrun