Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat
AgeCommit message (Collapse)Author
2014-05-04Merge commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a' into release/2.2Michael Niedermayer
* commit 'c4e764aa6980dd9dc7c423921b415ff7261c944a': rtmpproto: Make sure to pass on the error code if read_connect failed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04Merge commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb' into release/2.2Michael Niedermayer
* commit '0f6e309b97e3da83a0fa75fbf1c4b50cd72047eb': mp3enc: Properly write bitrate value in XING header Conflicts: libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-04matroska: add the Opus mappingAnton Khirnov
(cherry picked from commit 141fdc763c2841b572d29a2ad78513e8d5325870) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-05-03matroskadec: read the CodecDelay elementAnton Khirnov
(cherry picked from commit eb3b5501e8b85bfea09d533314cb6920efc42639) Signed-off-by: Reinhard Tartler <siretart@tauware.de> Conflicts: libavformat/matroskadec.c
2014-04-24avformat/mux: Check for and remove invalid packet durationsMichael Niedermayer
Fixes assertion failure Fixes Ticket3575 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dc6a17cf74a90e41d70ea1753cdb70c0a5b2ced8)
2014-04-23avformat/avidec: Speed up keyframe detection codeMichael Niedermayer
Fixes Ticket3531 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 57fb570908df2e84b11635f12b5be1fb27f053eb)
2014-04-23avformat/asfenc: dont allow non interleaved packetsMichael Niedermayer
The muxer does not support this currently Fixes ticket #3547. Fixes ticket #3555. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 369cdf917aaa5d7fbc61d57f87e638772e806716) (cherry picked from commit 514ec9bece86fed440ac829c10e82c4a0569c3a5)
2014-04-23avformat/pmpdec: remove cur_dts timestamp hackMichael Niedermayer
It appears the demuxer works fine without it Fixes Ticket3534 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5b19fc7aae986d6fa3d689f581b37e4bfba4f2d0)
2014-04-23avformat: Fix decoder search in find stream infoMichael Niedermayer
Fixes Ticket3548 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f3743901d7df906342f99b179382b19d8a4d9716)
2014-04-20rtmpproto: Make sure to pass on the error code if read_connect failedMartin Storsjö
Previously, if read_connect failed, the ret variable was unmodified and had the value 0, indicating success, which then was returned from the rtmp_open function, even though it actually failed. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 6477139721f559b26eafd415e23e13ea2b0c27e1) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-04-19ff_id3v2_read: add option to limit ID3 magic number searchPeter Ross
Several chunked formats (AIFF, IFF,DSF) store ID3 metadata within an 'ID3 ' chunk tag. If such chunks are stored sequentially, it is possible for the ID3v2 parser to confuse the chunk tag for the ID3 magic number. e.g. [1st chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] [2nd chunk tag ('ID3 ') | chunk size] [ID3 magic number | metadata ...] Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 5331773cc33ba26b9e26ace643d926219e46a17b) Conflicts: libavformat/dsfdec.c
2014-04-19ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULLPeter Ross
Fixes ticket #3530. Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit c94305ae23318c8956a30485cd5642829f4f16a9)
2014-04-16Fix compilation with --disable-everything --enable-muxer=avi --disable-network.Anh
Fixes ticket #3568. (cherry picked from commit c150e2cf324ce0572bb8b9b3501c45465cfbf360)
2014-04-12mp3enc: Properly write bitrate value in XING headerMichael Niedermayer
Instead of using a fixed bitrate_idx, calculate a matching bitrate for the XING header. Using a fixed bitrate_idx causes tools such as file(1) and mediainfo(1) to report wrong bitrate and bitrate mode when using CBR. Bug-Id: https://bugs.debian.org/736088 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 617a1a98a6be3e59db6fbfc21afab2fb9a049c03) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2014-04-10avformat/omadec: fix probetest failureMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a84f9c75bc3f55fed4f68d2503a08ab70c76ecbe) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23avformat/utils: detect MPEG streams with faulty DTS and discard affected DTSMichael Niedermayer
Fixes issue2.ts Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2dcaa1b9d142ae113b28bffdbf7f8f8900b5e770) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Revert "mpegts: do not set pts for missing dts in video streams"Michael Niedermayer
This reverts commit f65afef1df49f53e14c8d4173ff960fff8d44ecb. If only pts is coded then dts must be equal pts See Rec. ITU-T H.222.0 (06/2012) / ISO/IEC 13818-1:2013 (E) 2.7.5 Found-by: Baptiste Coudurier (cherry picked from commit 0bf882864ecd228d53555c57595eeca048662991) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23avformat/mp3dec: optimize mp3_seek() for dir < 0Michael Niedermayer
this minimizes the amount of protocol seeks and reading needed in that case Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 171dd67520b649a5b7a0f4fbff72ac88bbedfeab) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23avformat/aviobuf: optimize sequential backward seekingMichael Niedermayer
This reduces the number of protocol seeks Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 9600486d10a9728f1503363334268ecfafa9b0e5) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23avformat/aviobuf: factorize buffer_size outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 2adf422ce24bd8038d5d2f50549d0d3fb4170171) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23avformat/mp3enc: use av_copy_packet()Michael Niedermayer
Fixes double free Fixes Ticket3476 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d003a0cd2e587a47627fd328f9fc5a484adc29f2) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Merge commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85' into release/2.2Michael Niedermayer
* commit '29d61d73b1cbf0dcd1f79bc49c7df01b0a377c85': movenc: Allow override of major brand in ftyp atom Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Merge commit '9a6a7109985cbd3a20707b40cc31ed53a174195c' into release/2.2Michael Niedermayer
* commit '9a6a7109985cbd3a20707b40cc31ed53a174195c': matroskaenc: enable Annex B to MP4 conversion for HEVC tracks. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23Merge commit 'daaef403d122b35d87b27d6b369d287b1ed06973' into release/2.2Michael Niedermayer
* commit 'daaef403d122b35d87b27d6b369d287b1ed06973': matroskaenc: write private data in hvcC format for HEVC. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-23movenc: Allow override of major brand in ftyp atomJohn Stebbins
Signed-off-by: Tim Walker <tdskywalker@gmail.com> (cherry picked from commit 1e9db41e2a2166be5671b088ef4ad06a40af459f)
2014-03-21matroskaenc: enable Annex B to MP4 conversion for HEVC tracks.Tim Walker
(cherry picked from commit 558b20d729bc296d8e6a69f03cd509ad26a4827d)
2014-03-21matroskaenc: write private data in hvcC format for HEVC.Tim Walker
(cherry picked from commit a823d0948683bd97dd58556b5740e434166209a8)
2014-03-16Merge commit 'b5210f4eae30df587815b5f005f219aa723591d3' into release/2.2Michael Niedermayer
* commit 'b5210f4eae30df587815b5f005f219aa723591d3': http: Properly initialize icy headers string Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '10379d50be18325a07ef297bd2120d85a58ec78b' into release/2.2Michael Niedermayer
* commit '10379d50be18325a07ef297bd2120d85a58ec78b': http: Declare more parameters as const where possible Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c' into release/2.2Michael Niedermayer
* commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c': http: Allow setting a Content-Type for POST requests Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd' into release/2.2Michael Niedermayer
* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd': http: Always allow no-op seek Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2Michael Niedermayer
* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76': http: Add support for selecting a request range Conflicts: doc/protocols.texi libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '09dca5106698871920328ae8041d1437ce3cff43' into release/2.2Michael Niedermayer
* commit '09dca5106698871920328ae8041d1437ce3cff43': http: Support setting custom User-Agent Conflicts: doc/protocols.texi libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2Michael Niedermayer
* commit '40de74d0eb8c1898e2184a1484fe246aed5b295d': http: Export Content-Type information Conflicts: doc/protocols.texi libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit 'e2811c2ede428a20aec3630bef4378f2927fb306' into release/2.2Michael Niedermayer
* commit 'e2811c2ede428a20aec3630bef4378f2927fb306': http: Add support reading ICY metadata Conflicts: doc/protocols.texi libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2Michael Niedermayer
* commit '25d14b716aef43bf9e82f1d67a364e5922332f47': http: Refactor process_line Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit 'f1de93dec302cc860c718e89656f184510b2d239' into release/2.2Michael Niedermayer
* commit 'f1de93dec302cc860c718e89656f184510b2d239': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16http: handle ICY in presence of chunked transfer encodingwm4
Some http servers send an ICY stream in combination with chunked transfer encoding. This case was handled incorrectly by the ICY code: instead of handling chunked encoding before anything ICY related, both were mixed. Fix this by separating the ICY code from normal http reading. Move the normal http reading to a new function http_read_stream(), while http_read() handles ICY on top of http_read_stream(). The server identified itself as: cloudflare-nginx Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 636273d3d4a8c42f51832e8bf83e566e875916bf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 67f67a3748a038d880ed8a642184d2e3c76e29bb) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '738d68d' into release/2.2Michael Niedermayer
* commit '738d68d': http: Drop doxy comments Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16Merge commit '00ecce5' into release/2.2Michael Niedermayer
* commit '00ecce5': http: Return meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-15http: Properly initialize icy headers stringAlessandro Ghedini
The icy_metadata_headers string never gets initialized, so, during the first call to av_strlcatf() in parse_icy(), strlen() will be called on a pointer to uninitialized memory. At best this causes some garbage data to be left at the start of the string. By initializing icy_metadata_headers to the empty string, the first call to strlen() will always return 0, so that data is appended from the start of the string. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 6998a9f4c4e069f515c50614179f4cfc7d0184f5)
2014-03-15http: Declare more parameters as const where possibleMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit e77a2ea9505863e50bf013706f66bf8b7325e524)
2014-03-15http: Allow setting a Content-Type for POST requestsClément Bœsch
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4)
2014-03-15http: Improve options descriptionsReinhard Tartler
Add documentation where missing. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit fe568b3d27ca2c5cca3878b2a7a3a968e605aec4) Conflicts: libavformat/http.c
2014-03-15http: Always allow no-op seekAnssi Hannula
This also allows checking stream position as per ffurl_seek() doxy. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ab76d9f628ad46e1d3bbf26c5bf1f87083f239ab)
2014-03-15http: Add support for selecting a request rangeAnssi Hannula
Comment from Reimar Döffinger included as pro memoria. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 2ec33d27127251bbc45e1f88e60691ad59cf2319)
2014-03-15http: Support setting custom User-AgentClément Bœsch
Contextually make the default User-Agent use the common "Name/Version" pattern. Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ddfc98906373d1f17f6205cedd14c68d7a75995f)
2014-03-15http: Export Content-Type informationMichael Niedermayer
Bug-Id: https://bugs.debian.org/740421 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit e58c85b0686892960042232e51c77168b264838a)
2014-03-15http: Add support reading ICY metadataLuca Barbato
Export the metadata as a icy_metadata_packet avoption. Based on the work of wm4 and Alessandro Ghedini. Bug-Id: https://bugs.debian.org/739936 Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit 8075c3d8bb1f6aade0cc7c5c40db9bc1bcd84cab)
2014-03-15http: Refactor process_lineLuca Barbato
(cherry picked from commit 4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa)
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 03:19:53 +0300