summaryrefslogtreecommitdiff
path: root/libavformat/version.h
Commit message (Collapse)AuthorAge
* avformat: add support to force specific AVCodecsMichael Niedermayer2013-10-02
| | | | | | | | previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'Michael Niedermayer2013-09-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '705b748e8d8612385c96428ae36ed0d42a170d93': tls: Add support for listen mode Conflicts: doc/protocols.texi libavformat/tls.c libavformat/version.h See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Add support for listen modeMartin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | Also add options for specifying a certificate and key, which can be used both when operating as client and as server. Partially based on a patch by Peter Ross. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c': tls: Add options for verifying the peer certificate Conflicts: doc/protocols.texi libavformat/tls.c libavformat/version.h See: b2460858f64b2070d84dd861d4bbd16acfb9b0e9 See: 973a758f52a4e5fe63bd88806a4b2db034a032de Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Add options for verifying the peer certificateMartin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file containing the trusted CA certificates needs to be supplied via the ca_file AVOption, unless the TLS library has got a system default file/database set up. This doesn't check the hostname of the peer certificate with openssl, which requires a non-trivial piece of code for manually matching the desired hostname to the string provided by the certificate, not provided as a library function. That is, with openssl, this only validates that the received certificate is signed with the right CA, but not that it is the actual server we think we're talking to. Verification is still disabled by default since we can't count on a proper CA database existing at all times. Signed-off-by: Martin Storsjö <martin@martin.st>
* | matroskaenc: Add CuePoints for subtitle tracksJames Almer2013-09-20
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'Michael Niedermayer2013-09-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5': asfenc: mux chapters in ASF files using an ASF "marker" section Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * asfenc: mux chapters in ASF files using an ASF "marker" sectionVladimir Pantelic2013-09-19
| | | | | | | | | | | | | | | | ASF markers only have a start time, so we lose the chapter end times, but that is ASF for you Signed-off-by: Vladimir Pantelic <vladoman@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-18
|\| | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Add an option for omitting the tfhd base offset Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Add an option for omitting the tfhd base offsetMartin Storsjö2013-09-17
| | | | | | | | | | | | | | | | | | | | This makes the output fragments independent of their position in the output stream, making the output work better when streamed. QuickTime Player doesn't support fragmented mp4 without the base data offset, though. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '596e5d4783ca951258a7c580951fd161f1785ec1'Michael Niedermayer2013-09-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '596e5d4783ca951258a7c580951fd161f1785ec1': lavf: Add a flag to enable/disable per-packet flushing Conflicts: libavformat/avformat.h libavformat/mux.c libavformat/version.h This adds a 2nd API to set per packet flushing If the user application indicates through either a non default then this non default takes precedence over the other still default value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add a flag to enable/disable per-packet flushingLuca Barbato2013-09-16
| | | | | | | | | | | | | | | | | | This is enabled by default and can be disabled with "-fflags -flush_packets". Inspired by a patch from Nicolas George <nicolas.george@normalesup.org>. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/segafilm: remove deplanarization hackPaul B Mahol2013-09-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/matroska: Adding support for Opus CodecDelayVignesh Venkatasubramanian2013-09-10
| | | | | | | | | | | | | | | | | | | | | | | | In order to represent the codec delay accurately in Matroska, a new element CodecDelay has been introduced. It contains the overall delay added by the codec in nanoseconds. This patch adds support for muxing CodecDelay value in the container. Matroska spec for CodecDelay element can be found here: http://matroska.org/technical/specs/index.html#CodecDelay Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: make avformat_close_input() more tolerant.Clément Bœsch2013-09-04
| | | | | | | | | | The purpose of this commit is to make error management simpler and less error prone, just like av_free() which is safe with NULL.
* | avformat: H265 demuxerDirk Farin2013-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: export probe scoreMichael Niedermayer2013-08-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/image2: extend start_number range to accept zeroStefano Sabatini2013-08-22
| | | | | | | | Address trac ticket #2884.
* | lavf/tee: add special select optionStefano Sabatini2013-08-21
| |
* | Merge commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4'Michael Niedermayer2013-08-20
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b886f5c2f1e71b3e60e4265c500158d392b4b9a4': mkv: Allow flushing the current cluster in progress Conflicts: libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mkv: Allow flushing the current cluster in progressMartin Storsjö2013-08-19
| | | | | | | | | | | | | | | | Allow emitting the current cluster that is being written before starting a new one, simplifying how to figure out where clusters are positioned in the output stream (for live streaming). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavf/tee: add support for bitstream filteringStefano Sabatini2013-08-16
| | | | | | | | | | This allows to apply different bitstream filters to different outputs, with no need to transcode.
* | Remove FF_API_PKT_DUMP cruft. Not compiled since libavformat 54.Alexis Ballier2013-08-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/version.h: Drop FF_API_OLD_AVIO (unused and undefined since ↵Alexis Ballier2013-08-13
| | | | | | | | | | | | libavformat 55) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | mpegtsenc: add option tables_versionAndrey Utkin2013-08-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | * commit '0d6fa3977b016f1b72b0b24b8834ff9222498548': rtmp: Add seek support Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add seek supportGavriloaie Eugen-Andrei2013-08-02
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Supply a User-Agent header when opening rtsp streams.Carl Eugen Hoyos2013-07-11
| | | | | | | | | | | | Some rtsp servers like the IP Cam IcyBox IB-CAM2002 need it. Fixes ticket #2761. Reported, analyzed and tested by trac user imavra.
* | lavf/segment: add initial_offset optionStefano Sabatini2013-07-11
| | | | | | | | Should address trac ticket #2224.
* | avformat/AVFormatContext: Move fields down to match the forkMichael Niedermayer2013-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avconv uses private and internal fields from libavformat, we thus must match the layout even of the fields marked non public. Otherwise ffmpegs libavformat could not be used as a dropin replacement on debian/ubuntu The current soname of libavformat was not part of any release nor are any fields marked public moved thus in theory no installed shared lib ABI breakage should occur. Still the need for this change is unfortunate and chilling. If you installed shared libs from a recent development version of libavformat that is more recent than the last release. You probably want to check or rebuild applications that linked to it. minor versions of avformat & avdevice are bumped to allow detecting this as both use the updated struct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mp3dec: Add usetoc option to allow dlsabling the use of the xing TOCMichael Niedermayer2013-07-06
| | | | | | | | | | | | | | The toc is inexact and not using it can thus make sense. Using it is faster though, thus the opposite can similarly makes sense Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf: add support for libgmewm42013-07-02
| | | | | | | | | | Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/http: add support for reading streamcast metadatawm42013-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to request reading streamcast metadata. This uses AVOptions as API, and requires the application to explicitly request and read metadata. Metadata can be updated mid-stream; if an application is interested in that, it has to poll for the data by reading the "icy_metadata_packet" option in regular intervals. There doesn't seem to be a nice way to transfer the metadata in a nicer way. Converting the metadata to ID3v2 tags might be a nice idea, but the libavformat mp3 demuxer doesn't seem to read these tags mid-stream, and even then we couldn't guarantee that tags are not inserted in the middle of mp3 packet data. This commit provides the minimum to enable applications to retrieve this information at all. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavf: add AV_DISPOSITION flags for WebVTT text track kindsMatthew Heaney2013-06-25
| | | | | | | | | | | | | | | | | | | | | | There are 4 separate WebVTT text track kinds: subtitles (the default if not otherwise specified), captions, descriptions, and metadata. The WebM muxer needs to know which WebVTT text track kind this is, in order to synthesize the correct track type and codec id. To allow a demuxer to indicate the text track kind of the input, a new set of AV_DISPOSITION flag values has been added, corresponding to each of the non-default text track kind values.
* | lavf: add WebVTT muxer.Matthew Heaney2013-06-17
| | | | | | | | | | | | | | This revision creates a WebVTT muxer, that outputs files having the format described in the following specification: http://dev.w3.org/html5/webvtt/
* | lavf/md5enc: Use AV_HASH_MAX_SIZEJames Almer2013-06-15
| | | | | | | | | | | | | | Also increase the buffer size in write_trailer(), since 128 is not enough anymore Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/id3v2enc: fix cover art display on some softwareMatthieu Bouron2013-05-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding an arbitrary amount of padding bytes at the end of the ID3 metadata fixes cover art display for some software (iTunes, Traktor, Serato, Torq). For reference (ID3 metadata): [ Apic frames ] -> cover doesn't show up [ Apic frames, Padding ] -> ok [ Apic frames, ID3 frames ] -> ok [ ID3 frames, Apic frames ] -> cover doesn't show up [ ID3 frames, Apic frames, Padding ] -> ok
* | tta: remove pointless codePaul B Mahol2013-05-30
| | | | | | | | | | Checking seek table crc in decoder is pointless, as seek table is not used in decoder anyway, so also stop storing seek table into extradata.
* | Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'Michael Niedermayer2013-05-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2d2d6a4883479403798f4ed46941d5b365823570': lavf: add a raw WavPack muxer. apetag: add support for writing APE tags matroskaenc: support muxing WavPack Conflicts: libavformat/Makefile libavformat/allformats.c libavformat/apetag.h libavformat/version.h libavformat/wvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add a raw WavPack muxer.Anton Khirnov2013-05-28
| |
* | RedSpark demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | RSD demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ADP demuxerJames Almer2013-05-10
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521'Michael Niedermayer2013-05-03
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e3b225a4fe0ff1e64a220b757c6f0a5cf9258521': matroskaenc: add an option to put the index at the start of the file Conflicts: doc/muxers.texi libavformat/matroskaenc.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskaenc: add an option to put the index at the start of the fileAnton Khirnov2013-05-03
| |
* | lavf: data muxer and demuxer.Nicolas George2013-05-01
| | | | | | | | | | | | Allow to use tools designed to work with demuxers, muxers and packets (for example ffmpeg itself) to process raw byte streams (like aviocat).
* | subtitles: introduce ASS codec id and use it.Clément Bœsch2013-04-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we have a AV_CODEC_ID_SSA, which matches the way the ASS/SSA markup is muxed in a standalone .ass/.ssa file. This means the AVPacket data starts with a "Dialogue:" string, followed by a timing information (start and end of the event as string) and a trailing CRLF after each line. One packet can contain several lines. We'll refer to this layout as "SSA" or "SSA lines". In matroska, this markup is not stored as such: it has no "Dialogue:" prefix, it contains a ReadOrder field, the timing information is not in the payload, and it doesn't contain the trailing CRLF. See [1] for more info. We'll refer to this layout as "ASS". Since we have only one common codec for both formats, the matroska demuxer is constructing an AVPacket following the "SSA lines" format. This causes several problems, so it was decided to change this into clean ASS packets. Some insight about what is changed or unchanged in this commit: CODECS ------ - the decoding process still writes "SSA lines" markup inside the ass fields of the subtitles rectangles (sub->rects[n]->ass), which is still the current common way of representing decoded subtitles markup. It is meant to change later. - new ASS codec id: AV_CODEC_ID_ASS (which is different from the legacy AV_CODEC_ID_SSA) - lavc/assdec: the "ass" decoder is renamed into "ssa" (instead of "ass") for consistency with the codec id and allows to add a real ass decoder. This ass decoder receives clean ASS lines (so it starts with a ReadOrder, is followed by the Layer, etc). We make sure this is decoded properly in a new ass-line rectangle of the decoded subtitles (the ssa decoder OTOH is doing a simple straightforward copy). Using the packet timing instead of data string makes sure the ass-line now contains the appropriate timing. - lavc/assenc: just like the ass decoder, the "ssa" encoder is renamed into "ssa" (instead of "ass") for consistency with the codec id, and allows to add a real "ass" encoder. One important thing about this encoder is that it only supports one ass rectangle: we could have put several dialogue events in the AVPacket (separated by a \0 for instance) but this would have cause trouble for the muxer which needs not only the start time, but also the duration: typically, you have merged events with the same start time (stored in the AVPacket->pts) but a different duration. At the moment, only the matroska do the merge with the SSA-line codec. We will need to make sure all the decoders in the future can't add more than one rectangle (and only one Dialogue line in it obviously). FORMATS ------- - lavf/assenc: the .ass/.ssa muxer can take both SSA and ASS packets. In the case of ASS packets as input, it adds the timing based on the AVPacket pts and duration, and mux it with "Dialogue:", trailing CRLF, etc. - lavf/assdec: unchanged; it currently still only outputs SSA-lines packets. - lavf/mkv: the demuxer can now output ASS packets without the need of any "SSA-lines" reconstruction hack. It will become the default at next libavformat bump, and the SSA support will be dropped from the demuxer. The muxer can take ASS packets since it's muxed normally, and still supports the old SSA packets. All the SSA support and hacks in Matroska code will be dropped at next lavf bump. [1]: http://www.matroska.org/technical/specs/subtitles/ssa.html
* | lavf: add libquvi demuxer.Clément Bœsch2013-04-10
| |
* | ffmpeg/avformat: factor av_guess_frame_rate() outMichael Niedermayer2013-03-29
| | | | | | | | | | | | This will be used in ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>