summaryrefslogtreecommitdiff
path: root/libavformat/avisynth.c
Commit message (Collapse)AuthorAgeFilesLines
* avisynth: fix setting stream timebaseMarton Balint2015-08-131-4/+2
| | | | | | | | | | | | | 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>
* Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'Michael Niedermayer2015-04-171-5/+3
|\ | | | | | | | | | | | | | | | | | | * commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29': avisynth: Simplify shared library name construction Conflicts: libavformat/avisynth.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Simplify shared library name constructionDiego Biurrun2015-04-151-5/+3
| |
| * avisynth: Bump minimum required version to interface version 6Stephen Hutchinson2015-04-141-5/+6
| | | | | | | | | | | | | | 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>
| * avisynth: Fix detection of AviSynth 2.5Stephen Hutchinson2015-04-141-9/+9
| | | | | | | | | | | | | | | | | | 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>
| * avisynth: update documentation about the avisynth_c.h headerStephen Hutchinson2015-03-241-10/+1
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avisynth: Bump minimum required version to interface version 6Stephen Hutchinson2015-04-021-5/+6
| | | | | | | | | | | | | | 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>
* | avisynth: Fix detection of AviSynth 2.5Stephen Hutchinson2015-04-021-9/+9
| | | | | | | | | | | | | | | | | | 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>
* | avisynth: drop support of AviSynth 2.5Stephen Hutchinson2015-03-251-8/+15
| | | | | | | | | | | | | | 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>
* | Merge commit 'a8c99205ca8703bd849efae13fcf844315c7147d'Michael Niedermayer2015-03-241-10/+37
|\ \ | |/ | | | | | | | | | | * commit 'a8c99205ca8703bd849efae13fcf844315c7147d': avisynth: Fix compilation against current 2.6 header(s). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Fix compilation against current 2.6 header(s).Stephen Hutchinson2015-03-241-5/+37
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'f2ad1495f23376ce61542967f4fc14205f284d40'Michael Niedermayer2015-01-031-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f2ad1495f23376ce61542967f4fc14205f284d40': avisynth: Use RTLD_LOCAL instead of RTLD_GLOBAL Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Use RTLD_LOCAL instead of RTLD_GLOBALMartin Storsjö2015-01-031-1/+1
| | | | | | | | | | | | | | There shouldn't be any need to add the loaded libraries to the global symbol namespace. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avisynth: set duration of audio streamsHendrik Leppkes2014-05-161-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * avisynth: fix setting packet propertiesMichael Niedermayer2014-01-171-10/+12
| | | | | | | | | | | | Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avisynth: set duration of audio streamsHendrik Leppkes2014-05-051-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth simplify packet allocationMichael Niedermayer2014-01-101-24/+14
| | | | | | | | | | Reviewed-by: Stephen Hutchinson <qyot27@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Use av_packet_from_data instead of av_new_packetStephen Hutchinson2014-01-081-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | avisynth: More av_new_packet changesAnton Khirnov2014-01-081-9/+6
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'Michael Niedermayer2013-12-091-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: AviSynth demuxer rewrited s2013-12-081-166/+625
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * avisynth: K&R formatting cosmeticsDiego Biurrun2013-09-061-145/+150
| |
* | avformat/avisynth: remove duplicate av_new_packet() callMichael Niedermayer2013-12-011-1/+0
| | | | | | | | | | Found-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: make avs_library statically allocated.Anton Khirnov2013-12-011-33/+26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Move to av_new_packet/av_free_packet.Stephen Hutchinson2013-12-011-3/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: re-add trailing \n.Clément Bœsch2013-10-291-1/+1
| | | | | | | | | | | | Regression since ac9529ce. Spotted by Timothy Gu.
* | avisynth: Factor out a couple of returnsStephen Hutchinson2013-10-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Simplify a stray av_log messageStephen Hutchinson2013-10-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)Stephen Hutchinson2013-10-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Use AV_* prefixes for video and audio IDsStephen Hutchinson2013-10-281-6/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove outdated undef blockStephen Hutchinson2013-10-281-6/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove a couple of useless AviSynthContext castsStephen Hutchinson2013-10-281-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Don't declare structs anonymouslyStephen Hutchinson2013-10-281-4/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.Stephen Hutchinson2013-10-281-9/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-10-281-85/+116
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Change most of the comments to /* */ from //Stephen Hutchinson2013-10-281-22/+24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Introduce USING_AVISYNTH macroStephen Hutchinson2013-10-281-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'Michael Niedermayer2013-09-061-0/+1
|\ \ | |/ | | | | | | | | | | * commit '97b052e56807fab6887e9ba210a28a622e6a4b78': avisynth: Add missing #include for NULL_IF_CONFIG_SMALL Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Add missing #include for NULL_IF_CONFIG_SMALLDiego Biurrun2013-09-061-0/+1
| |
| * avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typoDiego Biurrun2013-07-291-1/+1
| | | | | | | | Also fix some similar typos in comments and documentation.
| * miscellaneous typo fixesDiego Biurrun2013-07-251-13/+13
| |
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-111-3/+0
| |
* | avisynth: Support video input from AviSynth 2.5 properly.Stephen Hutchinson2013-08-171-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the 2.5 compatibility header included with the variant of FFMS2 that uses AviSynth's C-interface. A copy of this header is now provided in compat/avisynth. avs_get_row_size_p and avs_get_height_p changed between versions 2.5 and 2.6. Since the avisynth_c.h header that avformat uses assumes AviSynth 2.6, it would cause 2.5 to crash if given any kind of real video (the Version() function was known to work, though). AvxSynth was unaffected by this issue because, despite being based on AviSynth 2.5.8 and using 2.5.8's interface version number of 3, it actually uses 2.6's versions of these functions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Exit gracefully when trying to serve video from v2.5.8.Stephen Hutchinson2013-08-071-0/+21
| | | | | | | | | | | | | | | | | | 'Fixes' ticket #2526 insofar as it stops 2.5.8 from crashing and tells the user to upgrade to 2.6 if they want to make video input work. A real solution to #2526 would be to get video input from 2.5.8 to work right. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-08-071-14/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace some deprecated definesPaul B Mahol2013-07-061-9/+9
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avisynth: Make sure the filename passed to Avisynth is in the right code pageOka Motofumi2013-06-221-0/+11
| | | | | | | | | | | | | | | | Avisynth is a non-unicode application and cannot accept UTF-8 characters. Therefore, the input filename should be converted to the code page that it expects. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/avisynth: Don't insert null frames or samples at the start of a stream.Stephen Hutchinson2013-04-111-4/+4
| | | | | | | | | | | | This is the last remaining issue from ticket #2412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Cosmeticsd s2013-04-101-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Fix off-by-one error in avisynth demuxer.d s2013-04-101-4/+6
| | | | | | | | | | | | Fixes ticket #2412. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status