summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba'Michael Niedermayer2014-10-22
|\ | | | | | | | | | | | | | | | | | | | | | | * commit 'b69183f65d0f6f4cd7a4e6c0deb57d59b0185aba': nutenc: check for negative index rather than assert Conflicts: libavformat/nutenc.c Not merged, the assert is correct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutenc: check for negative index rather than assertVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 703721
* | Merge commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | * commit 'be42c0b8d57fe2ea769892d102ffd5561dc18709': rmdec: stricter error check to avoid theoretical unitialized use Conflicts: libavformat/rmdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: stricter error check to avoid theoretical unitialized useVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 90558
* | Merge commit '7207dd8f829baee58b4df6c97c19ffde77039e8d'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '7207dd8f829baee58b4df6c97c19ffde77039e8d': rmdec: check av_new_packet return value Conflicts: libavformat/rmdec.c See: c01a462cda8d7f298a3ac6d20752d23a11e43a8a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rmdec: check av_new_packet return valueVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 733714
* | Merge commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '629b2ed0ac77d7c4bf1aeac5e70cafee5fa0fcae': flvdec: make sure to check create_stream and report the same error Conflicts: libavformat/flvdec.c See: d7d5b5dfc1b6f29646d2c1908c9bac8677f34256 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: make sure to check create_stream and report the same errorVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732242
* | Merge commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | * commit 'f22aa6b841dc54fa1dd804303885b1e230a5f629': flvdec: avoid unitialized use of a struct member See: 396ddcf22d55fa7e735d69eed22a4a4b1649b73c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flvdec: avoid unitialized use of a struct memberVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718141
* | Merge commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2'Michael Niedermayer2014-10-21
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e73d26bbd65f1ac5fc73ef3fd24cab1bed8ba2e2': smoothstreamingenc: explict cast to avoid overflow Conflicts: libavformat/smoothstreamingenc.c See: b399816d9c3d0fc3efd742b04f269c1055cc6e2b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * smoothstreamingenc: explict cast to avoid overflowVittorio Giovara2014-10-21
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732248
* | mov.c: reasonable bitrate for fragmented mp4Mika Raento2014-10-21
| | | | | | | | | | | | | | | | If using MFRA for timestamps, the stream may start from a large offset and/or have gaps. With this change we calculate the bitrate based on frames we've seen. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mov.c: Prevent memory leak in case of invalid metadata reads.Thilo Borgmann2014-10-21
| | | | | | | | | | Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtsp: Use ff_rtsp_averror()Andrey Utkin2014-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtspcodes: introduce ff_rtsp_averror()Andrey Utkin2014-10-21
| | | | | | | | | | | | Currently this is another name for ff_http_averror() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2771a1dc0a3695e8873adc16d068077f2417eea'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit 'd2771a1dc0a3695e8873adc16d068077f2417eea': rtpproto: Free the addrinfo pointer on failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpproto: Free the addrinfo pointer on failureLuca Barbato2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1238797
* | Merge commit '96bfb677478514db73d1b63b4213c97ad4269e8f'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | | | | | | | * commit '96bfb677478514db73d1b63b4213c97ad4269e8f': nutdec: Prevent a memory corruption Conflicts: libavformat/nutdec.c See: 05dd5368a92718f3a25f97f4697acffbabc7458f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nutdec: Prevent a memory corruptionLuca Barbato2014-10-20
| | | | | | | | | | | | Chapters do not have an event_flags field. Bug-Id: CID 1231990
* | Merge commit '350ed1829268d343b791208c8fd1cddd44d52a8e'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '350ed1829268d343b791208c8fd1cddd44d52a8e': rtpdec_hevc: drop unnecessary check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_hevc: drop unnecessary checkVittorio Giovara2014-10-20
| | | | | | | | | | | | len is always >=1 in that case. Bug-Id: CID 1238784
| * rtmpproto: remove dead codeVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Expression already evaluated before, redundant since 053386864219eccbcca1886c55f902f9555428a5. Bug-Id: CID 732199
| * wtv: clean memory on errorVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 718002
* | Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | * commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wtv: check seek_by_sector return valueVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1198258
* | Merge commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2'Michael Niedermayer2014-10-20
|\| | | | | | | | | | | | | | | * commit 'd7f530b0d67fe3996dbfa990a47c865e0d1400a2': aviobuf: check context before using it See: 7441d1ec330da810a0ffd44a02b2fc60add5b719 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aviobuf: check context before using itVittorio Giovara2014-10-20
| | | | | | | | | | | | | | Avoid a possible null pointer dereference. CC: libav-stable@libav.org Bug-Id: CID 1135769
| * avio: fix sizeof argumentMichael Niedermayer2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732284
| * idcin: fix return checkVittorio Giovara2014-10-20
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732198
* | lavf/mov.c: Allocate buffer in case of long metadata entries.Thilo Borgmann2014-10-20
| | | | | | | | | | | | Fixes ticket #4018 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Use ff_http_averror()Andrey Utkin2014-10-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/http: Introduce ff_http_averror()Andrey Utkin2014-10-20
| | | | | | | | | | | | | | | | | | | | | | | | | | int ff_http_averror(int status_code, int default_averror) This helper function returns AVERROR_ value from 3-digit HTTP status code. Second argument, default_averror, is used if no specific AVERROR_ is available. It is introduced because in different places of code different return codes are used - -1, AVERROR(EIO), AVERROR_INVALIDDATA. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | rtmpproto: Don't mistake app for playpath.Kacper Michajłow2014-10-19
| | | | | | | | | | | | | | | | | | For URLs "rtmp://server[:port]/foo" determine what `foo` refers to. If application name has been defined by the user assume that `foo` is a playpath, otherwise assume application name. Signed-off-by: Kacper Michajłow <kasper93@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/riff: Add UGY2Michael Niedermayer2014-10-19
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Add format_whitelistMichael Niedermayer2014-10-19
| | | | | | | | | | | | | | | | This allows restricting demuxers to a list of needed ones for improved security Note, some demuxers themselfs open other demuxers, these are only restricted if AVOptions are forwarded to them. Please check that your code does that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0034314a69e76a53534a74cceef865cfcb7b42cc'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit '0034314a69e76a53534a74cceef865cfcb7b42cc': rtmp: Always call rtmp_close() on rtmp_open() failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Always call rtmp_close() on rtmp_open() failureAlexander Drozdov2014-10-18
| | | | | | | | | | | | | | | | | | | | | | | | | | Prevent possible memory leaks. Connect to nginx and request a non-existent resource to trigger the issue. CC: libav-stable@libav.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Uwe L. Korn <uwelk@xhochy.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'fb238f8230c1b0314985482207add548c68f83cf'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit 'fb238f8230c1b0314985482207add548c68f83cf': urlprotocol: remove unused url_interrupt_cb declaration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * urlprotocol: remove unused url_interrupt_cb declarationAnton Khirnov2014-10-18
| | | | | | | | It is a remnant of the old interrupt callback API.
* | 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>
* | Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'Michael Niedermayer2014-10-18
|\| | | | | | | | | | | | | * commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467': rtmpproto: Track last received timestamp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Track last received timestampUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | Some RTMP commands need the most recent timestamp as their parameter, so keep track of it. This must be the most recent one and not e.g. the max received timestamp as it can decrease again through seeking. Signed-off-by: Martin Storsjö <martin@martin.st>
* | hlsenc.c, segment.c: propagate defaults to mpegtsMika Raento2014-10-17
| | | | | | | | | | | | | | | | | | This fixes the abnormally high ts overhead in the files produced by the HLS and segments muxers. See https://trac.ffmpeg.org/ticket/2857 . For example makes it much more likely that it can produces streams that fit under the 64kb App store limit. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/id3v2: support buggy id3v2.3 tag length in id3v2.4Benoit Fouet2014-10-17
| | | | | | | | | | | | | | | | | | Some encoders do not use syncsafe sizes in v2.4 id3 tags. Check the next tag to try to choose between the two. Fixes ticket #4003 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e65c776d18dc14df8a279e017760862f9fc8763b'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | * commit 'e65c776d18dc14df8a279e017760862f9fc8763b': rtmpproto: Add getStreamLength call to query duration Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add getStreamLength call to query durationUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | | | | | In (non-live) streams with no metadata, the duration of a stream can be retrieved by calling the RTMP function getStreamLength with the playpath. The server will return a positive duration upon the request if the duration is known, otherwise either no response or a duration of 0 will be returned. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '324b23dde1bc8638959eb32419c95a93906db272'Michael Niedermayer2014-10-17
|\| | | | | | | | | | | | | * commit '324b23dde1bc8638959eb32419c95a93906db272': rtmpproto: Add function to read a number response Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpproto: Add function to read a number responseUwe L. Korn2014-10-17
| | | | | | | | | | | | | | | | | | Packets that contain a number as a result to a rtmp function call are structured the same way (String, Number, Null, Number). This new method also includes more bounds checks to better handle packets that are not structured as expected. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 22:03:34 +0000