summaryrefslogtreecommitdiff
path: root/libavformat/version.h
Commit message (Collapse)AuthorAge
* Merge commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0'Michael Niedermayer2014-10-18
|\ | | | | | | | | | | | | | | | | | | * commit '9bec3ca2b878c83d2337bc6095bd51c3e3f8eef0': rtmpproto: Add pause support Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add pause supportUwe L. Korn2014-10-17
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat: Allow choosing the dump format field separator.Michael Niedermayer2014-10-09
| | | | | | | | | | | | The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'Michael Niedermayer2014-10-08
|\| | | | | | | | | | | | | | | | | | | * commit '7ae9791b641d1183910b6e7faca23f7ae08f8579': avformat: bump version after mime_type change Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: bump version after mime_type changeVittorio Giovara2014-10-08
| |
* | avformat: remove obsolete FF_API_READ_PACKET cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_CLOSE_INPUT_FILE cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_SET_PTS_INFO cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_NEW_STREAM cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_FORMAT_PARAMETERS cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: remove obsolete FF_API_ALLOC_OUTPUT_CONTEXT cruftJames Almer2014-10-05
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | sdp: add support for H.261Thomas Volkert2014-10-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '55f03d872640175a00bfa262da4652b7312b905f'Michael Niedermayer2014-10-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '55f03d872640175a00bfa262da4652b7312b905f': hlsenc: Add parameter -hls_allow_cache Conflicts: doc/muxers.texi libavformat/hlsenc.c libavformat/version.h See: 3edb9aaea6aaa6b93d708693cfa6454c17e03732 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsenc: Add parameter -hls_allow_cacheJoakim Roubert2014-10-03
| | | | | | | | | | | | | | | | | | | | | | | | | | The -hls_allow_cache parameter enables explicitly setting the EXT-X-ALLOW-CACHE tag in the manifest file. That tag indicates whether the client MAY or MUST NOT cache downloaded media segments for later replay. Valid values are 1 (=YES) or 0 (=NO) and the EXT-X-ALLOW-CACHE will not show in the manifest for other values (or if -hls_allow_cache is not used. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Kill timed SRTClément Bœsch2014-09-30
| |
* | avformat/assdec: output ASS packetsClément Bœsch2014-09-27
| | | | | | | | | | | | | | | | After this the order from the original file is stored through readorder when doing ffmpeg -i input.ass -c copy output.mkv. And now that the ASS muxer honors the ReadOrder, extracting the ass back (without transcoding) restores the original order.
* | avformat: add SUP/PGS subtitle demuxerwm42014-09-26
| | | | | | | | Signed-off-by: Clément Bœsch <u@pkh.me>
* | Autodetect jpg images.Carl Eugen Hoyos2014-09-26
| | | | | | | | | | | | Based on 2d3842f5 by Michael Niedermayer. Fixes ticket #2541.
* | Merge commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc'Michael Niedermayer2014-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ddf5fb71ee9c8b2d9a23c0f661a84896cd7050fc': rtpenc: HEVC/H.265 support Conflicts: Changelog libavformat/rtpenc.c libavformat/rtpenc_hevc.c libavformat/version.h See: 6821a5a4adcb40c458356e8bb90416dd8f5dd6b2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: HEVC/H.265 supportThomas Volkert2014-09-24
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | rtpenc: HEVC/H.265 supportThomas Volkert2014-09-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/hls: add hls_ts_optionSteven Liu2014-09-16
| | | | | | | | | | | | Same as COMMITID 4f5493fe2380ad4aba67759baa7d7d4437f2e776. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | avformat: remove FF_API_ASS_SSA dead codeClément Bœsch2014-09-09
| |
* | lavf/segment: add segment_format_options optionStefano Sabatini2014-09-07
| |
* | Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '95e177eeb21f3e968aa9353bc69d1946966cc835': rtpdec: HEVC/H.265 support Conflicts: Changelog libavformat/rtpdec_hevc.c libavformat/version.h See: 96b2ba68c4aef4e92b3e9de87d1fb94f2fb659f0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec: HEVC/H.265 supportThomas Volkert2014-09-03
| | | | | | | | | | | | As specified in draft-ietf-payload-rtp-h265-06. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d'Michael Niedermayer2014-08-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b263f8ffe7599d9cd27ec477a12700da8eb2790d': lavf: add AVFormatContext.max_ts_probe Conflicts: doc/APIchanges libavformat/avformat.h libavformat/utils.c libavformat/version.h lavf-fate/mp3 changes as the estimated input bitrate changes and that is copied to the output Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFormatContext.max_ts_probeAnton Khirnov2014-08-25
| | | | | | | | | | It allows to configure how long will avformat_find_stream_info() wait to get the first timestamp.
* | Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'Michael Niedermayer2014-08-22
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd': ogg: Provide aliases for Speex, Opus and audio-only ogg Conflicts: Changelog libavformat/oggenc.c libavformat/version.h See: 2ccc6ff03acc3ca31db1aeb828c747d05b5cb6aa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: Provide aliases for Speex, Opus and audio-only oggLuca Barbato2014-08-22
| | | | | | | | Since they are aliases for ogg enabling any of them enables ogg as well.
* | Merge commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d'Michael Niedermayer2014-08-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'afbd4b7e093adf6d7a830b32759ca3ba8500363d': lavf: add AVFormatContext/AVStream fields for signaling to the user when events happen. Conflicts: libavformat/avformat.h libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: add AVFormatContext/AVStream fields for signaling to the user when ↵Andrew Stone2014-08-13
| | | | | | | | | | | | | | | | | | | | | | events happen. The only flags, for now, indicate if metadata was updated and are set after each call to av_read_frame(). This comes with the caveat that, on stream start, it might not be set properly as packets might be buffered in AVFormatContext.packet_buffer before being given to the user in av_read_frame(). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '24c788f4878729a42150581d7ed7e9a11daf874d'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | * commit '24c788f4878729a42150581d7ed7e9a11daf874d': Remove obsolete FF_API_REFERENCE_DTS cruft. Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_REFERENCE_DTS cruft.Anton Khirnov2014-08-09
| |
* | Merge commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '24e87f7f425a52b1e69661dcb2fbe0555a76f30b': Remove obsolete FF_API_PROBE_MIME cruft. Conflicts: libavformat/avformat.h libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove obsolete FF_API_PROBE_MIME cruft.Anton Khirnov2014-08-09
| |
* | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8': Bump major versions of all libraries. Conflicts: doc/APIchanges libavcodec/version.h libavdevice/version.h libavfilter/version.h libavformat/version.h libavutil/version.h libswscale/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Bump major versions of all libraries.Anton Khirnov2014-08-09
| |
* | Merge commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e'Michael Niedermayer2014-08-09
|\| | | | | | | | | | | | | * commit 'f4c444e17d137c786f0ed2da0e5943df505d5f9e': Postpone API-incompatible changes until the next bump. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Postpone API-incompatible changes until the next bump.Anton Khirnov2014-08-09
| |
* | Autodetect jpeg-ls files.Carl Eugen Hoyos2014-08-08
| |
* | Autodetect webp files.Carl Eugen Hoyos2014-08-08
| |
* | lavf/avio: rename url_feof() to avio_feof()James Almer2014-08-08
| | | | | | | | | | | | | | It's a public function and should use the avio_ namespace Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-07
| | | | | | | | | | | | | | The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc'Michael Niedermayer2014-08-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb9244f20210fd420fb9b3c98126f9cae525d1cc': Add Icecast protocol Conflicts: Changelog configure doc/protocols.texi libavformat/icecast.c libavformat/version.h See: e3dc2c86fc4178b100484c54f12c88705cdf6724 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add Icecast protocolMarvin Scholz2014-08-04
| | | | | | | | | | | | Icecast is basically a convenience wrapper around the HTTP protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* | libavformat: Add Icecast protocolePirat2014-08-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add int64_t probesize2 instead of int probesize to AVFormatContext.Carl Eugen Hoyos2014-07-30
| | | | | | | | | | Allows to set a probesize >2G. Tested-by: Oliver Fromme
* | Merge commit '3a19405d574a467c68b48e4b824c76617fd59de0'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '3a19405d574a467c68b48e4b824c76617fd59de0': avformat: Use the mime type information in input probe Conflicts: libavformat/format.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use the mime type information in input probeLuca Barbato2014-07-29
| | | | | | | | | | It should provide a quicker guess for elementary streams provided by http.