Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-01Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'Clément Bœsch
* commit '3cc3463f306f425f76bd962755df1132eeac6dfa': avisynth: Support pix_fmts added to AviSynth+ This commit is mostly a noop, see 92916e8542e425ca20daddb490261a5818643206. Cosmetics and a small fix are merged. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-31Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'James Almer
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6': Drop pointless void* casts Merged-by: James Almer <jamrial@gmail.com>
2016-11-17avisynth: Support pix_fmts added to AviSynth+Stephen Hutchinson
A number of new pix_fmts* have been added to AviSynth+: 16-bit packed RGB and RGBA 10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4 8-, 10-, 12-, 14-, and 16-bit Planar RGB 8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA 10-, 12-, 14-, and 16-bit GRAY variants 32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY *some of which are not currently available pix_fmts here and were not added to the demuxer due to this Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-11-17avisynth: Simplify the pix_fmt check for the newer AviSynth APIStephen Hutchinson
The values don't need to be hardcoded since the correct values are returned by avs_bits_per_pixel. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-11-17avisynth: Fix setting stream timebaseMarton Balint
Stream timebase should be set using avpriv_set_pts_info, otherwise avctx->pkt_timebase is not correct, leading to A/V desync. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-11-13Drop pointless void* castsDiego Biurrun
2016-11-05avformat/avisynth.c: Use new safe dlopen code.Matt Oliver
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2016-10-27avisynth: fix Planar RGB outputStephen Hutchinson
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-30avisynth: support pix_fmts added to AviSynth+Stephen Hutchinson
A number of new pix_fmts have been added to AviSynth+: 16-bit packed RGB and RGBA 10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4 8-, 10-, 12-, 14-, and 16-bit Planar RGB 8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA* 10-, 12-, 14-, and 16-bit GRAY variants* 32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY* *some of which are not currently available pix_fmts here and were not added to the demuxer due to this Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-08-11avisynth: simplify the pix_fmt check for the newer AviSynth APIStephen Hutchinson
The values don't need to be hardcoded since the correct values are returned by avs_bits_per_pixel. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
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-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.
2015-08-13avisynth: fix setting stream timebaseMarton Balint
Stream timebase should be set using avpriv_set_pts_info, otherwise avctx->pkt_timebase is not correct. This should fix ticket #4766. Patch is only compile tested. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-04-17Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'Michael Niedermayer
* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29': avisynth: Simplify shared library name construction Conflicts: libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-15avisynth: Simplify shared library name constructionDiego Biurrun
2015-04-14avisynth: Bump minimum required version to interface version 6Stephen Hutchinson
The AVSC_API changes in the new headers mean that the 2.6 alphas are just as incompatible as 2.5 is. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-14avisynth: Fix detection of AviSynth 2.5Stephen Hutchinson
In order to safely exit when the user tries to use AviSynth 2.5, the continue_on_fail value for 2.6's functions need to be set to 1. Otherwise, the library loader fails before the 'upgrade to 2.6' log message appears. Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-04-03avisynth: Bump minimum required version to interface version 6Stephen Hutchinson
The AVSC_API changes in the new headers mean that the 2.6 alphas are just as incompatible as 2.5 is. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03avisynth: Fix detection of AviSynth 2.5Stephen Hutchinson
In order to safely exit when the user tries to use AviSynth 2.5, the continue_on_fail value for 2.6's functions need to be set to 1. Otherwise, the library loader fails before the 'upgrade to 2.6' log message appears. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-25avisynth: drop support of AviSynth 2.5Stephen Hutchinson
If the user attempts to use AviSynth 2.5, an error message will now tell them they need to upgrade. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'Michael Niedermayer
* commit 'a8c99205ca8703bd849efae13fcf844315c7147d': avisynth: Fix compilation against current 2.6 header(s). Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-24avisynth: update documentation about the avisynth_c.h headerStephen Hutchinson
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-24avisynth: Fix compilation against current 2.6 header(s).Stephen Hutchinson
AviSynth 2.6 (and by extension, AviSynth+) moves these functions into AVSC_API. This requires both adjusting their normal use, and for AvxSynth, adjusting the position/use of the USING_AVISYNTH ifdefs. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-01-03Merge commit 'f2ad1495f23376ce61542967f4fc14205f284d40'Michael Niedermayer
* commit 'f2ad1495f23376ce61542967f4fc14205f284d40': avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03avisynth: Use RTLD_LOCAL instead of RTLD_GLOBALMartin Storsjö
There shouldn't be any need to add the loaded libraries to the global symbol namespace. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-05-16avisynth: set duration of audio streamsHendrik Leppkes
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-05-05avisynth: set duration of audio streamsHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-17avisynth: fix setting packet propertiesMichael Niedermayer
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-01-10avformat/avisynth simplify packet allocationMichael Niedermayer
Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-08avisynth: Use av_packet_from_data instead of av_new_packetStephen Hutchinson
If the audio changes from 9eac7c4 were merged as they were, this would cause scripts with both video+audio to fail with a lot of audio decoding errors (the video would be fine). Scripts with only one of either video or audio were unaffected. Additionally, the av_packet changes in general caused seeking to break. Using av_packet_from_data allows video+audio scripts to work as expected, without audio decoding errors. It also fixes seeking. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-08avisynth: More av_new_packet changesAnton Khirnov
These are the remaining av_packet-related bits from 9eac7c4 that didn't get merged at that time. Changes authored by Anton Khirnov <anton@khirnov.net>, split out from 9eac7c4 by Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'Michael Niedermayer
* commit 'f0b234ab9e406efee85c17eb435db646092a943b': avformat: AviSynth demuxer rewrite Conflicts: configure libavformat/avisynth.c See: b9ad009475f3afb76bd2fbd92936dc4d4cd441ec (as well as later commits) Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-09avformat: AviSynth demuxer rewrited s
Directly loads AviSynth through LoadLibrary instead of relying on Video for Windows, and supports using AvxSynth (via dlopen) to open scripts on Linux and OS X. Error messages from AviSynth/AvxSynth are now reported through av_log and exit, rather than the traditional behavior of generating an error video that the user would need to watch to diagnose. The main rewrite was authored by d s <avxsynth.testing@gmail.com> from the AvxSynth team, with additional contributions by Oka Motofumi <chikuzen.mo@gmail.com> Stephen Hutchinson <qyot27@gmail.com> Diego Biurrun <diego@biurrun.de> Anton Khirnov <anton@khirnov.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-12-02avformat/avisynth: remove duplicate av_new_packet() callMichael Niedermayer
Found-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01avisynth: make avs_library statically allocated.Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01avisynth: Move to av_new_packet/av_free_packet.Stephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avformat/avisynth: re-add trailing \n.Clément Bœsch
Regression since ac9529ce. Spotted by Timothy Gu.
2013-10-29avisynth: Factor out a couple of returnsStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Simplify a stray av_log messageStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)Stephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Use AV_* prefixes for video and audio IDsStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Remove outdated undef blockStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Remove a couple of useless AviSynthContext castsStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Don't declare structs anonymouslyStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.Stephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: CosmeticsStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Change most of the comments to /* */ from //Stephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-29avisynth: Introduce USING_AVISYNTH macroStephen Hutchinson
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>