summaryrefslogtreecommitdiff
path: root/libavformat/version.h
Commit message (Collapse)AuthorAge
* 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>
* | Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530': lavf: remove disabled FF_API_R_FRAME_RATE cruft Conflicts: libavformat/avformat.h libavformat/electronicarts.c libavformat/rawdec.c libavformat/utils.c libavformat/version.h The field is in use and no semantically equivalent field is available, thus not removed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_R_FRAME_RATE cruftAnton Khirnov2013-03-11
| |
* | avformat: postpone API removials where the functions are trivial wrapersMichael Niedermayer2013-03-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7b486ab13bfcfa88a7cd92586de50e49966ec292'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | * commit '7b486ab13bfcfa88a7cd92586de50e49966ec292': lavf: remove disabled FF_API_AV_GETTIME cruft lavf: remove disabled FF_API_INTERLEAVE_PACKET cruft Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_AV_GETTIME cruftAnton Khirnov2013-03-11
| |
| * lavf: remove disabled FF_API_INTERLEAVE_PACKET cruftAnton Khirnov2013-03-11
| |
* | Merge commit '435c2a31ad5eead20eda1152097f60c3bfa22847'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '435c2a31ad5eead20eda1152097f60c3bfa22847': lavf: remove disabled FF_API_READ_PACKET cruft Conflicts: libavformat/version.h Removial postponed as wraper is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_READ_PACKET cruftAnton Khirnov2013-03-11
| |
* | Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201': lavf: remove disabled FF_API_APPLEHTTP_PROTO cruft Conflicts: libavformat/allformats.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_APPLEHTTP_PROTO cruftAnton Khirnov2013-03-11
| |
* | Merge commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6'Michael Niedermayer2013-03-13
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0a7c4daf469d4ac447fb822fe78337f62f4c04e6': lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruft Conflicts: libavformat/version.h removial postponed as the wraper code is trivial Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove disabled FF_API_CLOSE_INPUT_FILE cruftAnton Khirnov2013-03-11
| |
* | Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'Michael Niedermayer2013-03-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111': Add the bumps and APIchanges entries for reference counted buffers changes. Conflicts: Changelog doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add the bumps and APIchanges entries for reference counted buffers changes.Anton Khirnov2013-03-08
| |
* | lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-07
| |
* | Revert "lavf/concatdec: define "ffcat" and "ffconcat" extensions"Nicolas George2013-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6cc12353a88dfb21c4c5a38e6c83280483b0ec88. Conflicts: libavformat/version.h Allowing to automatically select the concat demuxer raises security concerns, as it allows a possibly hostile file to access any file on the system. Guessing the format based on the file name extension does not allow to enable the safe mode designed to avoid it.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Handle the environment variable no_proxy more properlyMartin Storsjö2013-02-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of the environment variable no_proxy, present since one of the initial commits (de6d9b6404), is inconsistent with how many other applications and libraries interpret this variable. Its bare presence does not indicate that the use of proxies should be skipped, but it is some sort of pattern for hosts that does not need using a proxy (e.g. for a local network). As investigated by Rudolf Polzer, different libraries handle this in different ways, some supporting IP address masks, some supporting arbitrary globbing using *, some just checking that the pattern matches the end of the hostname without regard for whether it actually is the right domain or a domain that ends in the same string. This simple logic should be pretty similar to the logic used by lynx and curl. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/concatdec: define "ffcat" and "ffconcat" extensionsStefano Sabatini2013-02-28
| |
* | WAV muxer: add RF64 supportDaniel Verkamp2013-02-12
| |
* | lavf: add tee pseudo-muxer.Nicolas George2013-02-09
| |
* | lavf/hls: broker HTTP optionsMicah Galizia2013-01-23
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge commit '4f56e773fe8a554b8c2662650aaf799c2ece2721'Michael Niedermayer2013-01-22
|\| | | | | | | | | | | | | | | | | | | | | * commit '4f56e773fe8a554b8c2662650aaf799c2ece2721': x86: ac3: Fix HAVE_MMXEXT condition to only refer to external assembly rtpenc: Start the sequence numbers from a random offset Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Start the sequence numbers from a random offsetMartin Storsjö2013-01-22
| | | | | | | | | | | | | | | | Expose the current sequence number via an AVOption - this can be used both for setting the initial sequence number, or for querying the current number. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610'Michael Niedermayer2013-01-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'a2a991b2ddf951454ffceb7bcedc9db93e26c610': srtp: Improve the minimum encryption buffer size check srtp: Add support for a few DTLS-SRTP related crypto suites Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * srtp: Add support for a few DTLS-SRTP related crypto suitesMartin Storsjö2013-01-21
| | | | | | | | | | | | | | | | The main difference to the existing suites from RFC 4568 is that the version with a 32 bit HMAC still uses 80 bit HMAC for RTCP packets. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/segment: add support to segment list file entries sliding window listingStefano Sabatini2013-01-19
| | | | | | | | In particular, should fix trac ticket #1842.
* | Add a new function av_codec_get_tag2().Carl Eugen Hoyos2013-01-17
| | | | | | | | | | | | av_codec_get_tag() may return 0 both in case a codec_tag was found and if no codec_tag was found. The new function does not have this ambiguity.
* | lavf/http: add HTTP protocol cookie supportMicah Galizia2013-01-15
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05'Michael Niedermayer2013-01-15
|\| | | | | | | | | | | | | | | | | | | | | * commit '2f3bada63e57345329c4f9b48e9b81b5cfc03d05': lavf: Add a protocol for SRTP encryption/decryption rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES) Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Add a protocol for SRTP encryption/decryptionMartin Storsjö2013-01-15
| | | | | | | | | | | | | | | | This is mostly useful for encryption together with the RTP muxer, but could also be set up as IO towards the peer with the SDP demuxer with custom IO. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtsp: Support decryption of SRTP signalled via RFC 4568 (SDES)Martin Storsjö2013-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This only takes care of decrypting incoming packets; the outgoing RTCP packets are not encrypted. This is enough for some use cases, and signalling crypto keys for use with outgoing RTCP packets doesn't fit as simply into the API. If the SDP demuxer is hooked up with custom IO, the return packets can be encrypted e.g. via the SRTP protocol. If the SRTP keys aren't available within the SDP, the decryption can be handled externally as well (when using custom IO). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '86d9181cf41edc3382bf2481f95a2fb321058689'Michael Niedermayer2013-01-09
|\| | | | | | | | | | | | | | | | | | | * commit '86d9181cf41edc3382bf2481f95a2fb321058689': rtpdec: Support sending RTCP feedback packets Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: Support sending RTCP feedback packetsMartin Storsjö2013-01-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sends NACK for missed packets and PLI (picture loss indication) if a depacketizer indicates that it needs a new keyframe, according to RFC 4585. This is only enabled if the SDP indicated that feedback is supported (via the AVPF or SAVPF profile names). The feedback packets are throttled to a certain maximum interval (currently 250 ms) to make sure the feedback packets don't eat up too much bandwidth (which might be counterproductive). The RFC specifies a more elaborate feedback packet scheduling. The feedback packets are currently sent independently from normal RTCP RR packets, which is not totally spec compliant, but works fine in the environments I've tested it in. (RFC 5506 allows this, but requires a SDP attribute for enabling it.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | Support decoding AC-3 in wav.Carl Eugen Hoyos2013-01-06
| | | | | | | | | | All known samples are actually ac3-in-spdif-in-wav, so use the spdif demuxer to get the ac3 frames.
* | mmf.c: Use LIBAVFORMAT_IDENT when writing Yamaha SMAF version information.Carl Eugen Hoyos2013-01-05
| |
* | astenc: Enable the loop flag only when neededJames Almer2013-01-05
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>