summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
...
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-31
|\| | | | | | | | | | | | | | | | | | | * qatar/master: hls: Call avformat_find_stream_info() on the chained demuxers Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Call avformat_find_stream_info() on the chained demuxersMichael Niedermayer2013-07-30
| | | | | | | | | | | | | | | | | | This allows the chained demuxer (or more precisely, the lavf utility code) to better fill in timestamps on packets from these, especially for cases where one stream is a raw ADTS stream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/webvttenc: use proper printf format for int64_t valuesPaul B Mahol2013-07-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | asfdec: Skip to keyframe after seekingMichael Niedermayer2013-07-30
| | | | | | | | | | | | Fixes Ticket1616 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/gxfenc: replace deprecated PIX_FMT constantsMichael Niedermayer2013-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | * commit '1f57d60129b0e297cd197c6031c4439b30a6b503': rtsp: Support RFC4570 (source specific multicast) more properly. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtsp: Support RFC4570 (source specific multicast) more properly.Ed Torbett2013-07-29
| | | | | | | | | | | | | | Add support for domain names, for multiple source addresses, for exclusions, and for session level specification of addresses. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit '74972220909787af5a3ffe66f7fa8041827c2bd2': rtpproto: Support more than one SSM include address, support excludes Conflicts: libavformat/rtpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Support more than one SSM include address, support excludesEd Torbett2013-07-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7d99c92945e4b2d12ed2126365482e1900340da0'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit '7d99c92945e4b2d12ed2126365482e1900340da0': udp: Keep track of include and exclude sources separately Conflicts: libavformat/udp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Keep track of include and exclude sources separatelyEd Torbett2013-07-29
| | | | | | | | | | | | | | This allows us to explicitly fail if the caller tried to set both inclusions and exclusions at the same time. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | * commit '3357bccc5cb31795f248cd72dc480025f3075a5b': udp: Allow specifying multicast include/blocks as host names as well Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * udp: Allow specifying multicast include/blocks as host names as wellEd Torbett2013-07-29
| | | | | | | | | | | | | | | | Previously this only allowed literal IP addresses. When these are conveyed in a SDP file as in RFC4570, host names are allowed as well. Signed-off-by: Martin Storsjö <martin@martin.st>
| * avisynth: Fix a "AVISynth" vs. "AviSynth" struct name typoDiego Biurrun2013-07-29
| | | | | | | | Also fix some similar typos in comments and documentation.
* | Merge commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | * commit '06205b5efdcf0bc4c5463bfdd02f09b5f79fc4cd': hls: Free packets when skipping packets when seeking Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Free packets when skipping packets when seekingMartin Storsjö2013-07-29
| | | | | | | | | | | | This fixes memory leaks present since 2b3d041cdc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a2b7eeeb06471979ee39fd3075a04633222678a6'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit 'a2b7eeeb06471979ee39fd3075a04633222678a6': hlsproto: Store all durations in AV_TIME_BASE Conflicts: libavformat/hlsproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hlsproto: Store all durations in AV_TIME_BASEMartin Storsjö2013-07-29
| | | | | | | | | | | | | | Also parse segment durations as floating point, which is allowed since HLS version 3. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c44191039944526dd7eb6e536990b555837961f5'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit 'c44191039944526dd7eb6e536990b555837961f5': hls: Store all durations in AV_TIME_BASE Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Store all durations in AV_TIME_BASEMartin Storsjö2013-07-29
| | | | | | | | | | | | | | | | | | Also parse segment durations as floating point, which is allowed since HLS version 3. This is based on a patch by Zhang Rui. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce'Michael Niedermayer2013-07-30
|\| | | | | | | | | | | | | | | | | | | * commit 'e1d5b244761cf69db655ad7ece1dbf2c13dd4fce': hls: Store first_timestamp in units of AV_TIME_BASE Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Store first_timestamp in units of AV_TIME_BASEMartin Storsjö2013-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first_timestamp was stored as-is, its actual time base wasn't known later in the seek function. Additionally, the logic (from 795d9594cfa) for scaling it based on stream_index is flawed - stream_index in the seek function only specifies which stream the seek timestamp refers to, but obviously doesn't say anything about which stream first_timestamp belongs to. In the cases where stream_index was >= 0 and all streams had the same time base, this didn't matter in practice. Seeking taking first_timestamp into account is problematic when one variant is mpegts (with real timestamps) and one variant is raw ADTS (with timestamps only being accumulated packet duration), where the variants start at totally different timestamps. Signed-off-by: Martin Storsjö <martin@martin.st>
* | asfdec: remove "ignoring invalid packet_obj_size" codeMichael Niedermayer2013-07-30
| | | | | | | | | | | | The code is no longer needed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: move packet_obj_size to ASFStreamMichael Niedermayer2013-07-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | asfdec: avoid using AVStream->priv_dataMichael Niedermayer2013-07-30
| | | | | | | | | | | | | | This ensures that we dont write into one struct and read the other without realizing that they arent identical. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: hls: Create an AVProgram for each variant Conflicts: libavformat/hls.c See: 23db5418ed2ebaddbbc57a45b81caa6e94724587 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Create an AVProgram for each variantLYF2013-07-29
| | | | | | | | | | | | | | | | | | Without the information, an application may choose audio from one variant and video from another variant, which leads to fetching two variants from the network. This enables av_find_best_stream() to find matching audio and video streams, so that only one variant is fetched. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9d64f236292ba28018dd9afd2d57f8f944b33f81'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * commit '9d64f236292ba28018dd9afd2d57f8f944b33f81': hls: Respect the different stream time bases when comparing dts Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Respect the different stream time bases when comparing dtsMichael Niedermayer2013-07-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adjust the streams timestamps according to their start timestamp when comparing. This helps getting correctly interleaved packets if one stream lacks timestamps (such as a plain ADTS stream when the other variants are full mpegts) when the others have timestamps that don't start from zero. This probably doesn't work properly if such a stream is temporarily disabled (via the discard flags) and then reenabled, and such streams are hard to correctly sync against the other streams as well - but this works better than before at least. The segment number restriction makes sure all variants advance roughly at the same pace as well. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * commit 'c11e33a3d9665dd1fc5dbdecdd03a4860ac6a622': hls: Set stream offset before opening a chained demuxer Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Set stream offset before opening a chained demuxerMartin Storsjö2013-07-29
| | | | | | | | | | | | | | This makes sure we don't accidentally check discard flags for the wrong stream. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cdd2d73d315ecaf19ff49e64c91923275f1bda68': hls: Don't check discard flags until the parent demuxer's streams actually exist hls: Copy the time base from the chained demuxer Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Don't check discard flags until the parent demuxer's streams actually existMichael Niedermayer2013-07-29
| | | | | | | | | | | | | | | | If passing the end of one segment while initializing the chained demuxer, the parent demuxer's streams aren't set up yet, so we can't recheck the discard flags. Signed-off-by: Martin Storsjö <martin@martin.st>
| * hls: Copy the time base from the chained demuxerMichael Niedermayer2013-07-29
| | | | | | | | | | | | | | When a variant stream isn't mpegts but e.g. raw adts, the default time base (90k) isn't correct. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eb33ba04e03d9f36e23fffd442510c824be709c3'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * commit 'eb33ba04e03d9f36e23fffd442510c824be709c3': hls: Return all packets from a previous variant before moving on to the next one Conflicts: libavformat/hls.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hls: Return all packets from a previous variant before moving on to the next oneMartin Storsjö2013-07-29
| | | | | | | | | | | | | | | | | | | | This serves as a safeguard; normally we want to use the dts comparison to interleave packets from all active variants. If that dts comparison for some reason doesn't work as intended, make sure that all packets in all variants for a certain sequence number have been returned before moving on to the next one. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * commit 'c5b46a064d9991f2cd045c90179fccf35ecffc34': lavf: Don't interpret just slightly broken timestamps as wraparound Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Don't interpret just slightly broken timestamps as wraparoundMichael Niedermayer2013-07-29
| | | | | | | | | | | | | | This avoids breaking some slightly incorrect (dts > pts) timestamps in sample HLS streams from Apple. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | | | * commit '2219e27b5b17d146e4ab71a3ed86dfc013fb7a93': oma: correctly mark and decrypt partial packets Conflicts: libavformat/omadec.c See: dcd013a535bccbb163b740b72bbedde67dc8e633 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: correctly mark and decrypt partial packetsLuca Barbato2013-07-28
| | | | | | | | | | | | | | | | Incomplete crypted files would lead to a read after buffer boundary otherwise. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | * commit '9d0b45ade864f3d2ccd8610149fe1fff53c4e937': oma: check geob tag boundary Conflicts: libavformat/omadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: check geob tag boundaryLuca Barbato2013-07-28
| | | | | | | | | | | | | | Prevent read after buffer boundary on corrupted tag. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | * commit '4f03a77e52596cbe9ec179666ddb3e0345a8133a': oma: refactor seek function Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oma: refactor seek functionLuca Barbato2013-07-28
| | | | | | | | Properly propagate seek errors from avio and the generic pcm seek.
* | Merge commit '0f51c398beac87682b2249662b97e30512f7868c'Michael Niedermayer2013-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0f51c398beac87682b2249662b97e30512f7868c': http: Support reading gzip/deflate compressed data utvideoenc: use av_image_copy_plane() Conflicts: libavformat/http.c See: b09d86c6366f2933d7bec430486d9d56bf98f7b6 See: 6bab3430a775183f2f9acbd91d1376c71e87c026 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Support reading gzip/deflate compressed dataZhang Rui2013-07-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> Normally, http servers shouldn't send this to us since we don't advertise it with an Accept-Encoding header, but some servers still do it anyway. Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggenc: Write stream metadata if availableJames Almer2013-07-28
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/movenc: improve psp checkMatthieu Bouron2013-07-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/movenc: remove useless checks on AVOutputFormatMatthieu Bouron2013-07-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'Michael Niedermayer2013-07-28
|\| | | | | | | | | | | | | * commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d': Remove unreachable returns Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 08:53:15 +0000