summaryrefslogtreecommitdiff
path: root/libavformat/version.h
Commit message (Collapse)AuthorAge
* 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>
* | Merge commit 'e96406eda4f143f101bd44372f7b2d542183000a'Michael Niedermayer2013-01-04
|\| | | | | | | | | | | | | | | | | | | * commit 'e96406eda4f143f101bd44372f7b2d542183000a': rtsp: Add support for depacketizing RTP data via custom IO Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Add support for depacketizing RTP data via custom IOMartin Storsjö2013-01-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To use this, set sdpflags=custom_io to the sdp demuxer. During the avformat_open_input call, the SDP is read from the AVFormatContext AVIOContext (ctx->pb) - after the avformat_open_input call, during the av_read_frame() calls, the same ctx->pb is used for reading packets (and sending back RTCP RR packets). Normally, one would use this with a read-only AVIOContext for the SDP during the avformat_open_input call, then close that one and replace it with a read-write one for the packets after the avformat_open_input call has returned. This allows using the RTP depacketizers as "pure" demuxers, without having them tied to the libavformat network IO. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/webvtt: use ff_subtitles_read_chunk().Clément Bœsch2013-01-03
| | | | | | | | | | The FATE test is updated because the line breaks in the dialogue rectangles are now proper CRLF.
* | subviewer: sanitize packets.Clément Bœsch2013-01-03
| | | | | | | | | | | | | | | | The data does not contain timing or trailing line breaks anymore. In addition to being less idiotic, it is consistent with other codecs and thus allows more switches between formats and codecs. It also fixes the issue of the trailing line returns being simple \n instead of CRLF in the ASS rectangle dialogue (this is the reason of the FATE update).
* | lavf: add data: URI scheme.Nicolas George2013-01-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-01
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add support for limelight authentication rtmp: Add support for adobe authentication Conflicts: Changelog libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Add support for limelight authenticationMartin Storsjö2012-12-31
| | | | | | | | | | | | | | | | | | Limelight is a not too uncommon CDN. The authentication scheme is pretty similar to the adobe authentication, but is even closer to normal http digest authentication (but not close enough to warrant sharing code) than the adobe version. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtmp: Add support for adobe authenticationMartin Storsjö2012-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly used to authenticate the client when publishing. Tested with wowza and akamai. Some but not all servers support resending a new connect invoke within the same connection, so always reconnect for sending a new connection attempt. This matches what other applications do as well. The authentication scheme is structurally pretty similar to http digest authentication, but uses base64 instead of hex strings. Signed-off-by: Martin Storsjö <martin@martin.st>
| * tak: demuxer, parser, and decoderPaul B Mahol2012-12-07
| | | | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Sony Wave64 muxerPaul B Mahol2012-12-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | microdvd: sanitize AVPackets.Clément Bœsch2012-12-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current MicroDVD AVPackets contain timing information and trailing line breaks. The data is now only composed of the markup data. Doing this consistently between text subtitles decoders allows to use different codec for various formats. For instance, MicroDVD markup is sometimes found in some VPlayer files. Also, generally speaking, the subtitles text decoders have no use of these timings (and they must not use them since it would break any user timing adjustment). Technically, this is a major ABI break. In practice, a mismatching lavf/lavc will now error out for MicroDVD decoding. Supporting both formats requires unnecessary complex and fragile code. FATE needs update because line breaks in the ASS file were "\n" (because that's what is used in the original file). ASS format expect "\r\n" line breaks; this commit fixes this issue. Also note that this "\r\n" trailing need to be moved at some point from the decoders to the ASS muxer.
* | Add SubViewer v1 subtitles demuxer and decoder.Clément Bœsch2012-12-31
| |