summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
| * Remove unreachable returnsDiego Biurrun2013-07-27
| |
* | Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'Michael Niedermayer2013-07-28
|\| | | | | | | | | | | | | * commit 'c8f0b20b4a6bb6691928789d83e4b02896969848': avidec: Let the inner dv demuxer take care of discarding Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: Let the inner dv demuxer take care of discardingLuca Barbato2013-07-27
| | | | | | | | CC: libav-stable@libav.org
* | Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'Michael Niedermayer2013-07-28
|\| | | | | | | | | | | | | | | | | | | * commit '10aa44aa675e05067845e3e55fac37642cbbdae4': avidec: K&R formatting cosmetics Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avidec: K&R formatting cosmeticsLuca Barbato2013-07-27
| | | | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-27
|\| | | | | | | | | | | | | | | | | | | * qatar/master: wtv: Drop some casts that now are unnecessary Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: Drop some casts that now are unnecessaryMartin Storsjö2013-07-26
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'Michael Niedermayer2013-07-27
|\| | | | | | | | | | | | | | | | | | | * commit '86f042dcabde2a5386dbd95ab0451b274987d253': wtv: Make WTV_SECTOR_BITS a 64 bit constant Conflicts: libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: Make WTV_SECTOR_BITS a 64 bit constantMartin Storsjö2013-07-26
| | | | | | | | | | | | | | | | This makes sure that values that are left-shifted by this constant end up casted to 64 bit before shifting, avoiding overflow if the value ends up larger than 2 GB. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avio: Don't set the seekable flag if no seek function is providedHendrik Schreiber2013-07-26
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'Michael Niedermayer2013-07-27
|\| | | | | | | | | | | | | * commit '1297f7b87f8a84930a23eca705765c7c353dfcd5': rtpenc: Fix some odd comments Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpenc: Fix some odd commentsMartin Storsjö2013-07-26
| | | | | | | | | | | | | | Some weird comments stem from the fact that the rtpdec and rtpenc code was shared earlier. Signed-off-by: Martin Storsjö <martin@martin.st>
| * miscellaneous typo fixesDiego Biurrun2013-07-25
| |
* | avformat/dtsdec: Improve probe, reject things looking like analoge signalsMichael Niedermayer2013-07-26
| | | | | | | | | | | | Fixes Ticket2810 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'Michael Niedermayer2013-07-26
|\| | | | | | | | | | | | | | | | | | | * commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3': cosmetics: Add '0' to float constants ending in '.'. Conflicts: libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Add '0' to float constants ending in '.'.Diego Biurrun2013-07-25
| |
* | avformat/gxfenc: Added support for writing correct auxiliary data for DV ↵Reuben Martin2013-07-25
| | | | | | | | | | | | | | | | streams. Different aux data is written for DVCAM and DVPRO formats. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: implement CueRelativePositionBernie Habermeier2013-07-24
| | | | | | | | | | | | | | | | | | | | This is a minimal change to matroskaenc that implements CueRelativePosition in the output. Most players will probably ignore this additional information, but it is in the matroska spec, and it'd be nice to be able to make use of it. Signed-off-by: Bernt Habermeier <bernt@wulfram.com> Tested-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | documented that av_codec_close is required to callAnshul Maheshwari2013-07-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: support reading compressed dataZhang Rui2013-07-24
| | | | | | | | | | | | | | | | | | | | | | | | Derived from VLC's http module. Original authors: Antoine Cellerier <dionoea@videolan.org> Sébastien Escudier <sebastien-devel@celeos.eu> Rémi Duraffort <ivoire@videolan.org> Rémi Denis-Courmont <remi@remlab.net> Francois Cartegnie <fcvlcdev@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/aviobuf/ffio_init_context: set seekable automaticallyHendrik Schreiber2013-07-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: avoid floating point arithmeticMichael Niedermayer2013-07-22
| | | | | | | | | | | | Should make things more reproducable across platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: parse EXTINF duration as floating-point numberZhang Rui2013-07-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "avformat/utils: Close codec context since it is allocated by ↵Michael Niedermayer2013-07-21
| | | | | | | | | | | | | | | | | | | | | | | | avformat_new_stream in refrence to ticket 2716" This causes a race condition with VLC. Its plausible that other applications also would have races with it and its just fixing a memleak when the user application forgets to free the codec. It causes more problems than it solves in its current form, thus the revert. Better solutions are welcome This reverts commit 0f229f9b91fe3c4ebd97e88f004d638819b76add.
* | avformat/utils: Close codec context since it is allocated by ↵Anshul Maheshwari2013-07-21
| | | | | | | | | | | | avformat_new_stream in refrence to ticket 2716 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'Michael Niedermayer2013-07-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9': rtsp: Support multicast source filters (RFC 4570) rtpproto: Check the source IP if one single source has been specified rtpproto: Support IGMPv3 source specific multicast inclusion Conflicts: libavformat/rtpproto.c libavformat/rtsp.c libavformat/rtsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support multicast source filters (RFC 4570)Ed Torbett2013-07-19
| | | | | | | | | | | | | | | | | | | | This supports inclusion of one single IP address for now, at the media level. Specifying the filter at the session level (instead of at the media level), multiple source addresses, exclusion, or using FQDNs instead of plain IP addresses is not supported (yet at least). Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpproto: Check the source IP if one single source has been specifiedMartin Storsjö2013-07-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If another peer is sending unicast packets to the same port that we are listening on, those packets can end up being received despite using source specific multicast. For those cases, manually check the source address of received packets against the intended source address. This only handles the case when the source list is one single IP address for now, which probably is the most common case. Based on a patch by Ed Torbett. Signed-off-by: Martin Storsjö <martin@martin.st>
| * rtpproto: Support IGMPv3 source specific multicast inclusionEd Torbett2013-07-19
| | | | | | | | | | | | | | | | | | Blocking/exclusion is not supported yet. The rtp protocol parameter takes the same form as the existing sources parameter for the udp protocol. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/matroskaenc: Only change chapter ids if needed.Michael Niedermayer2013-07-19
| | | | | | | | | | | | | | | | This also fixes the case where negative chapter ids where input And fixes the case where remuxing from mkv changed chapter ids Found-by: Luca Barbato Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | img2enc: add option to use strftime() for filenameRamiro Polla2013-07-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rt*p: Joining a SSM multicast group using an SDP (Issue #2171)Ed Torbett2013-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Passes Source-Specific Multicast parameters read from an sdp file through to the UDP socket code, allowing source-specific multicast streams to be correctly received. As an integral part of this change, additional checking (currently only enabled in the case of SSM streams, but probably useful in similar scenarios) has been added to the RTP protocol handler to distinguish UDP packets arriving from multiple sources to the same port and process only the expected packets (those transmitted from the expected UDP source address). This resolves an issue identified when multiple instances of FFmpeg subscribe to different Source-Specific Multicast streams but with each sharing the same destination port. Signed-off-by: Edward Torbett <ed.torbett@simulation-systems.co.uk> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbiscomment: Add DESCRIPTION to ff_vorbiscomment_metadata_convJames Almer2013-07-18
| | | | | | | | | | | | | | | | It's the official (or recommended) name for comment/description entries. See https://www.xiph.org/vorbis/doc/v-comment.html Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/riff: Add ITRK tagJames Almer2013-07-18
| | | | | | | | | | | | | | | | Some players, like foobar2000 or modern versions of WMP, create WAV files using the ITRK tag for track instead of IPRT Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge https://github.com/lukaszmluki/ffmpegMichael Niedermayer2013-07-18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * https://github.com/lukaszmluki/ffmpeg: ftp: warning about pure-ftp server used as and output ftp: comments ftp: remove unused headers ftp: fix interrupt callback misuse Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ftp: warning about pure-ftp server used as and outputLukasz Marek2013-07-17
| | |
| * | ftp: commentsLukasz Marek2013-07-17
| | |
| * | ftp: remove unused headersLukasz Marek2013-07-17
| | |
| * | ftp: fix interrupt callback misuseLukasz Marek2013-07-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FTP protocol used interrupt callback to simulate nonblock operation which is a misuse of this callback. This commit make FTP protocol fully blocking and removes invalid usage of interrutp callback Also adds support for multiline responses delimited with dashes
* | | lavf/matroskaenc: using valid chapter idsFabian Neundorf2013-07-18
|/ / | | | | | | | | | | | | Fixes ticket 2790, by starting the ChapterUIDs in mkv files with 1 instead of a 0.   Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: simplify mkv_check_tag()Michael Niedermayer2013-07-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/matroskaenc: Check for valid metadata before creating tagsJames Almer2013-07-17
| | | | | | | | | | | | | | | | | | | | | | Tags must have at least one SimpleTag element to be spec conformant. Updated lavf-mkv and seek-lavf-mkv FATE references as the tests were affected by this. Fixes ticket #2785 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskaenc: use ffio_fill()Paul B Mahol2013-07-16
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mastroka audio muxer: Set long_name to Matroska Audio so that it differs ↵Alexis Ballier2013-07-16
| | | | | | | | | | | | from the long_name of matroska video. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-16
|\| | | | | | | | | | | | | * qatar/master: lavf: Make sure avg_frame_rate can be calculated without integer overflow Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Make sure avg_frame_rate can be calculated without integer overflowMartin Storsjö2013-07-15
| | | | | | | | | | | | | | | | | | If either of the deltas is too large for the multiplications to succeed, don't use this for setting the avg frame rate. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '31931520df35a6f9606fe8293c8a39e2d1fabedf'Michael Niedermayer2013-07-16
|\| | | | | | | | | | | | | * commit '31931520df35a6f9606fe8293c8a39e2d1fabedf': mov: Do not allow updating the time scale after it has been set Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Do not allow updating the time scale after it has been setMartin Storsjö2013-07-15
| | | | | | | | | | | | | | | | | | | | | | | | The time scale is set in mdhd, and later validated in the enclosing trak atom once all of its children have been parsed. A loose mdhd atom outside of a trak atom could update the time scale of the last stream without any validation. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5b4eb243bce10a3e8345401a353749e0414c54ca'Michael Niedermayer2013-07-16
|\| | | | | | | | | | | | | | | | | | | * commit '5b4eb243bce10a3e8345401a353749e0414c54ca': mov: Seek back if overreading an individual atom Conflicts: libavformat/mov.c See: 6093960ae35c8d69c559b5604f683c2ea3f279ca Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mov: Seek back if overreading an individual atomMartin Storsjö2013-07-15
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 02:02:27 +0000