summaryrefslogtreecommitdiff
path: root/libavformat/avisynth.c
Commit message (Collapse)AuthorAge
* Merge commit 'f0b234ab9e406efee85c17eb435db646092a943b'Michael Niedermayer2013-12-09
|\ | | | | | | | | | | | | | | | | | | | | | | * 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-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06
| |
* | avformat/avisynth: remove duplicate av_new_packet() callMichael Niedermayer2013-12-01
| | | | | | | | | | Found-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: make avs_library statically allocated.Anton Khirnov2013-12-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Move to av_new_packet/av_free_packet.Stephen Hutchinson2013-12-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: re-add trailing \n.Clément Bœsch2013-10-29
| | | | | | | | | | | | Regression since ac9529ce. Spotted by Timothy Gu.
* | avisynth: Factor out a couple of returnsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Simplify a stray av_log messageStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Switch a couple of AVERROR_UNKNOWNs to AVERROR(ENOMEM)Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Use AV_* prefixes for video and audio IDsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove outdated undef blockStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Remove a couple of useless AviSynthContext castsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Don't declare structs anonymouslyStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Compact AvxSynth's avoidance of 2.6's colorspaces.Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: CosmeticsStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Change most of the comments to /* */ from //Stephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avisynth: Introduce USING_AVISYNTH macroStephen Hutchinson2013-10-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '97b052e56807fab6887e9ba210a28a622e6a4b78'Michael Niedermayer2013-09-06
|\| | | | | | | | | | | | | * 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-06
| |
| * avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typoDiego Biurrun2013-07-29
| | | | | | | | Also fix some similar typos in comments and documentation.
| * miscellaneous typo fixesDiego Biurrun2013-07-25
| |
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-11
| |
* | avisynth: Support video input from AviSynth 2.5 properly.Stephen Hutchinson2013-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | '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-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | replace some deprecated definesPaul B Mahol2013-07-06
| | | | | | | | 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-22
| | | | | | | | | | | | | | | | 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-11
| | | | | | | | | | | | This is the last remaining issue from ticket #2412 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Cosmeticsd s2013-04-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avisynth: Fix off-by-one error in avisynth demuxer.d s2013-04-10
| | | | | | | | | | | | Fixes ticket #2412. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Use PIX_FMT_BGR24 for the AviSynth demuxer, instead of RGB24.Stephen Hutchinson2013-03-31
| | | | | | | | | | | | | | Partial fix for ticket #2412 in that using PIX_FMT_BGR24 fixes the swapped channels issue when using scripts serving RGB24. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix avisynth_context_create constructor error handling.d s2013-03-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | AviSynth demuxer rewrite.d s2013-03-21
| | | | | | | | | | | | | | | | Dynamically loads the library itself, rather than through VfW. Supports AvxSynth on Linux and OS X. Supports the new colorspaces added in AviSynth 2.6 when used with AviSynth 2.6.
* | Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'Michael Niedermayer2013-01-31
|\| | | | | | | | | | | | | | | | | | | | | * commit '29f1fa74225e9fdbab6d590857edbecb51cf74da': configure: Move newlib libc check before mingw libc check avisynth: Change demuxer name to avoid conflicts with AVS Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Change demuxer name to avoid conflicts with AVSDiego Biurrun2013-01-31
| |
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: flvdec: remove spurious use of stream id lavf: deprecate r_frame_rate. lavf: round estimated average fps to a "standard" fps. Conflicts: ffmpeg.c ffprobe.c libavformat/avformat.h libavformat/electronicarts.c libavformat/flvdec.c libavformat/rawdec.c libavformat/utils.c tests/ref/fate/iv8-demux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: deprecate r_frame_rate.Anton Khirnov2012-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
* | Add missing CRLFs to avisynth error messages.Carl Eugen Hoyos2012-06-05
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: http: Add the url_shutdown function for https, too http: Simplify code by removing a local variable http: Clear the old URLContext pointer when closed tcp: Try enabling SO_REUSEADDR when listening tcp: Check the return values from bind and accept avisynth: Make sure the filename passed to avisynth is in the right code page Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avisynth: Make sure the filename passed to avisynth is in the right code pageOka Motofumi2012-05-31
| | | | | | | | | | | | | | | | avisynth is a non-unicode application and cannot accept UTF-8 characters. Therefore, the input filename should be converted to the correct code page that it expects. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove AVFormatParameters from AVFormatContext.read_header signatureAnton Khirnov2012-01-27
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | | | | | It's supposed to be called only from (de)muxers.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (44 commits) replacement Indeo 3 decoder gsm demuxer: do not allocate packet twice. flvenc: use first packet delay as global delay. ac3enc: doxygen update. imc: return error codes instead of 0 for error conditions. imc: return meaningful error codes instead of -1 imc: do not set channel layout for stereo imc: validate channel count imc: check for ff_fft_init() failure imc: check output buffer size before decoding imc: use DSPContext.bswap16_buf() to byte-swap packet data rtsp: add allowed_media_types option libgsm: add flush function to reset the decoder state when seeking libgsm: simplify decoding by using a loop gsm: log error message when packet is too small libgsmdec: do not needlessly set *data_size to 0 gsmdec: do not needlessly set *data_size to 0 gsmdec: add flush function to reset the decoder state when seeking libgsmdec: check output buffer size before decoding gsmdec: log error message when output buffer is too small. ... Conflicts: Changelog ffplay.c libavcodec/indeo3.c libavcodec/mjpeg_parser.c libavcodec/vp3.c libavformat/cutils.c libavformat/id3v2.c libavutil/parseutils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove some stray unnecessary ffmpeg references.Diego Biurrun2011-11-02
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: presets: rename presets directory lavc: make avcodec_get_context_defaults3 "officially" public lavf: replace av_new_stream->avformat_new_stream part II. lavf,lavd: replace av_new_stream->avformat_new_stream part I. lavf: add avformat_new_stream as a replacement for av_new_stream. Use correct scaling table for bwd-pred MVs in second B-field Ut Video decoder Makefile: change presets extension to .avpreset lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs lavfi: add testsrc source AVOptions: add documentation. presets: update libx264 ffpresets Conflicts: Changelog doc/APIchanges doc/ffmpeg.texi ffpresets/libx264-ipod320.ffpreset ffpresets/libx264-ipod640.ffpreset ffserver.c libavcodec/avcodec.h libavcodec/options.c libavcodec/version.h libavdevice/libdc1394.c libavfilter/avfilter.h libavfilter/vsrc_testsrc.c libavformat/flvdec.c libavformat/riff.c libavformat/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: replace av_new_stream->avformat_new_stream part II.Anton Khirnov2011-10-19
| | | | | | | | | | | | | | | | Manual replacements are done in this commit. In many cases, the id is some constant made up number (e.g. 0 for video and 1 for audio), which is then not used in the demuxer for anything. Those ids are removed.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 01:31:36 +0000