summaryrefslogtreecommitdiff
path: root/doc
Commit message (Collapse)AuthorAge
* WavPack encoderPaul B Mahol2013-08-14
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/filters: reformat scale filter docTimothy Gu2013-08-13
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* doc/filters.texi: Fix duplicate wordsMichael Niedermayer2013-08-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc/filter_design.txt: Fix duplicate wordsMichael Niedermayer2013-08-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix wrong use of "an" in some comments.Thilo Borgmann2013-08-12
|
* Make new VDPAU easier to use by adding context to callback.Reimar Döffinger2013-08-11
| | | | | | | | | | | | | | | | | | | | | | | | | Using VDPAU correctly means checking for preemption and possibly regenerating the context all the time. With the current API there is no context or other user-defined pointer and thus this in not possible during decoding unless using some hack like global variables. The need to reinitialize both surfaces and even function pointers makes handling preemption even more difficult. This patch introduces a new render2 function that gets both the AVCodecContext and AVFrame in addition, in both the user can store additional opaque data. This allows even advanced approaches like keeping a "generation counter" for the surfaces so they can be regenerated on the fly and efficiently. In addition, the function has a return value that will be passed through all the way instead of being silently ignored as for the current render function. Unfortunately the HWAccel API has no way of providing API/ABI compatibility, so a currently disallowed state (render pointer being NULL) is used to extend it. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* vdpau: Add an allocation function for AVVDPAUContext.Reimar Döffinger2013-08-11
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'Michael Niedermayer2013-08-11
|\ | | | | | | | | | | | | | | | | | | * commit '205a4502d3da9de2db75d2c965c9d065574e9266': doc: Clarify the avconv section about -re Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Clarify the avconv section about -reMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'Michael Niedermayer2013-08-11
|\| | | | | | | | | | | | | | | * commit 'd175a5730b42166704b7262b33f4b780d9d92f60': doc: Add an example on publishing over RTMP doc: Add librtmp to the section header for the librtmp specific details Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Add an example on publishing over RTMPMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * doc: Add librtmp to the section header for the librtmp specific detailsMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a435ca5b4d9efebf0759220681010977c36615f7'Michael Niedermayer2013-08-11
|\| | | | | | | | | | | | | * commit 'a435ca5b4d9efebf0759220681010977c36615f7': doc: Explain that the default RTMP user agent is different when publishing Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Explain that the default RTMP user agent is different when publishingMartin Storsjö2013-08-10
| | | | | | | | | | | | | | | | | | The fact that a different user agent is used is cruicial for getting publishing authentication working. (When using librtmp, this other user agent has to be specified manually, but that's not needed with the libavformat internal RTMP support.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'Michael Niedermayer2013-08-11
|\| | | | | | | | | | | | | * commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec': doc: Extend the rtmp example to include how to pass username/password Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc: Extend the rtmp example to include how to pass username/passwordMartin Storsjö2013-08-10
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'Michael Niedermayer2013-08-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d': lavc: Add refcounted api to AVPacket Conflicts: libavcodec/avpacket.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Add refcounted api to AVPacketLuca Barbato2013-08-10
| | | | | | | | Provide a clean way to manipulate packets.
* | doc/filters: fix sine sample_rate abbreviationMark Harris2013-08-10
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | doc: apply various grammar fixesBryce W. Harrington2013-08-10
| | | | | | | | | | | | | | | | The first sentence of each of the modified man pages are worded a bit awkwardly. These minor copy-edits should make them clearer. Signed-off-by: Bryce Harrington <b.harrington@samsung.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'Michael Niedermayer2013-08-08
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3e5898782dce60334ab294821ca00b19c648cf66': Voxware MetaSound decoder Conflicts: Changelog libavcodec/Makefile libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Voxware MetaSound decoderKostya Shishkov2013-08-08
| |
* | Merge commit '605387582bd35920b83a26dabbe1c0601f425621'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '605387582bd35920b83a26dabbe1c0601f425621': lavf: Support unix sockets Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Support unix socketsLuca Barbato2013-08-05
| |
* | Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'bc54c2ae3ca6abd225dc331eafc12108513158de': libx264: add shortcut for the bluray compatibility option Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: add shortcut for the bluray compatibility optionLuca Barbato2013-08-05
| | | | | | | | As for intra-refresh it is just a commodity.
* | Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'f824535a4a79c260b59d3178b8d958217caffd78': vdpau: deprecate bitstream buffers within the hardware context Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate bitstream buffers within the hardware contextRémi Denis-Courmont2013-08-05
| | | | | | | | | | | | | | | | The bitstream buffers are now private and freed by libavcodec. For backward compatibility, the hold bitstream buffer pointer is left NULL (applications were supposed to av_freep() it). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '549294fbbe1c00fee37dc4d3f291b98945e11094': vdpau: deprecate VDPAU codec capability Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate VDPAU codec capabilityRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'a0ad5d011318f951ecd4c9ffe1829518c9533909': vdpau: deprecate old codec-specific pixel formats Conflicts: libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate old codec-specific pixel formatsRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '811bd0784679dfcb4ed02043a37c92f9df10500e': avconv: make input -ss accurate when transcoding Conflicts: Changelog doc/ffmpeg.texi ffmpeg.h ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: make input -ss accurate when transcodingAnton Khirnov2013-08-05
| | | | | | | | | | Insert (a)trim filters on the corresponding inputs, so the extra frames are decoded and discarded.
* | mpegts: add fix_teletext_pts mpegts demuxer optionMarton Balint2013-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes since v1 of the patch: - enable option by default - add documentation - move up PTS override code after PES header parsing, to ensure we use the last PCR before the first packet of the teletext PES packet. The option overrides teletext packet PTS and DTS values with the timestamps calculated from the PCR of the first program which the teletext stream is part of and is not discarded. Using the same teletext PID for multiple programs is possible, therefore we need some kind of heuristics to know which program PCR we should synchronize to. Using the first non-discarded PCR pid among the programs of the teletext stream seemed like a good choice. The patch does not do PCR interpolation to estimate the PCR of the teltetext packet, it just uses the last PCR of the program, which may cause a slight error (0.1 sec) in the teletext packet pts-es. Based on a patch by Reimar Döffinger. http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-September/131610.html Signed-off-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: Implementation of 32 bit fixed point FFTNedeljko Babic2013-08-04
| | | | | | | | | | | | | | | | Iterative implementation of 32 bit fixed point split-radix FFT. Max FFT that can be calculated currently is 2^12. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers: Document use case of mpegts muxer option tables_versionAndrey Utkin2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vf_scale: add force_original_aspect_ratioTimothy Gu2013-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/examples/filtering_audio: make const arrays also staticMichael Niedermayer2013-08-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/muxers: Document previously undocumented mpegts muxer optionsAndrey Utkin2013-08-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a': avcodec: Add output_picture_number to AVCodecParserContext Conflicts: doc/APIchanges libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Add output_picture_number to AVCodecParserContextYusuke Nakamura2013-08-02
| | | | | | | | | | | | Set output_picture_number in H.264 parser. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | * commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c': doc/print_options: Move options headers to a saner place Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doc/print_options: Move options headers to a saner placeDiego Biurrun2013-08-02
| |
* | Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e': Give less generic names to global library option arrays Conflicts: libavcodec/options_table.h libavfilter/avfilter.c libavformat/options_table.h libswscale/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give less generic names to global library option arraysDiego Biurrun2013-08-02
| |
| * avconv: add -n option to immediately exit when output files already existVittorio Giovara2013-07-31
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/protocols: Document file protocol optionsAndrey Utkin2013-08-01
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Document new 'blocksize' option of 'pipe' protocolAndrey Utkin2013-07-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libxvid: Add SSIM displaying through a libxvidcore pluginTimothy Gu2013-07-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>