summaryrefslogtreecommitdiff
path: root/libavformat
Commit message (Collapse)AuthorAge
* Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'Michael Niedermayer2013-09-27
|\ | | | | | | | | | | | | * commit '06ebc0bf9a6401733a4ce1310325de19f631819a': lavf: Allocate arrays with av_realloc if they will be realloced later Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Allocate arrays with av_realloc if they will be realloced laterMartin Storsjö2013-09-26
| | | | | | | | | | | | | | Pointers returned from av_malloc can't in general be passed to av_realloc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1af78b865b66acb8020c54262f12aa41ad47e05c'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | * commit '1af78b865b66acb8020c54262f12aa41ad47e05c': rtpdec_qt: Add an accidentally removed allocation return value check Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtpdec_qt: Add an accidentally removed allocation return value checkMartin Storsjö2013-09-26
| | | | | | | | | | | | This check was mistakenly removed in 5626f994f. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '705b748e8d8612385c96428ae36ed0d42a170d93': tls: Add support for listen mode Conflicts: doc/protocols.texi libavformat/tls.c libavformat/version.h See: 4f4eb380f0f96dbb7cdd2b812fa92b8b47a0f27c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Add support for listen modeMartin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | Also add options for specifying a certificate and key, which can be used both when operating as client and as server. Partially based on a patch by Peter Ross. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | * commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1': http: Pass options through to the nested protocol Conflicts: libavformat/http.c See: b6f435fbc87c024f8403fca69e6e6b98bccf93fa Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Pass options through to the nested protocolMartin Storsjö2013-09-26
| | | | | | | | | | | | | | | | When passing a dict to the nested protocol, it will consume the used options from it, so a separate copy needs to be used when reopening the connection multiple times. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c': tls: Add options for verifying the peer certificate Conflicts: doc/protocols.texi libavformat/tls.c libavformat/version.h See: b2460858f64b2070d84dd861d4bbd16acfb9b0e9 See: 973a758f52a4e5fe63bd88806a4b2db034a032de Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Add options for verifying the peer certificateMartin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file containing the trusted CA certificates needs to be supplied via the ca_file AVOption, unless the TLS library has got a system default file/database set up. This doesn't check the hostname of the peer certificate with openssl, which requires a non-trivial piece of code for manually matching the desired hostname to the string provided by the certificate, not provided as a library function. That is, with openssl, this only validates that the received certificate is signed with the right CA, but not that it is the actual server we think we're talking to. Verification is still disabled by default since we can't count on a proper CA database existing at all times. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mpegts: check avio_tell() return code before using itMichael Niedermayer2013-09-26
| | | | | | | | | | | | Fixes Ticket2962 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/wavdec: check smv_frames_per_jpegMichael Niedermayer2013-09-26
| | | | | | | | | | | | | | | | | | Values outside would not be possible due to limitations of jpeg itself Fixes very long running loop Fixes Ticket2977 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: minor simplification / use AV_WB16()Michael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Better heuristic for ordering packetsMichael Niedermayer2013-09-26
| | | | | | | | | | | | This prevents underflows in quite constrained cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: Better default for max_delayMichael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: change assert to av_assert0Michael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegenc: improve field names in underflow error messageMichael Niedermayer2013-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'Michael Niedermayer2013-09-25
|\| | | | | | | | | | | | | * commit '668643b9239c70b777aea322eab411ebc960d9a0': matroskadec: check av_strdup() when setting defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: check av_strdup() when setting defaultsAnton Khirnov2013-09-24
| |
| * movenchint: Clear size and len if the realloc failedMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | Previously these were left in an inconsistent state. Pointed out by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/omadec: simplify checks in nprobe()Michael Niedermayer2013-09-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494': movenc: Return a proper error code for invalid combinations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Return a proper error code for invalid combinationsMartin Storsjö2013-09-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f7e616959aff8706edccdae763c24c897c449f6f': electronicarts: Check packet sizes before reading Conflicts: libavformat/electronicarts.c See: fb1ea777b3a01be6d71a103529ad37982707cacc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * electronicarts: Check packet sizes before readingMartin Storsjö2013-09-22
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | * commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4': lavf: Avoid setting avg_frame_rate if delta_dts is negative Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Avoid setting avg_frame_rate if delta_dts is negativeMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | | | This avoids setting avg_frame_rate to invalid (negative) values. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'f1eac2b8a0370b908cd691086d11f51342054730': movenc: Use keyframes as default fragmentation point in ismv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Use keyframes as default fragmentation point in ismvMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | Fragmenting blindly to a certain duration isn't a good choice if one should be able to switch between different qualities, therefore default to keyframes instead. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd': movenc: Set all implicit flags immediately in mov_write_header Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set all implicit flags immediately in mov_write_headerMartin Storsjö2013-09-22
| | | | | | | | | | | | | | | | This makes sure other sanity checks for conflicting options can work properly, e.g. for the conflict between the faststart flag when using the ismv mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | | | | | | | * commit '187023f6b2b43966acb2449a379b4ededdc4b22e': movenc: Set mov->mode earlier in mov_write_header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * movenc: Set mov->mode earlier in mov_write_headerMartin Storsjö2013-09-22
| | | | | | | | | | | | | | This allows simplifying some early checks that depend on the muxer mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3': tls: Do not abort on non-fatal TLS alerts with gnutls Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls: Do not abort on non-fatal TLS alerts with gnutlsMartin Storsjö2013-09-22
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'c951e4b442df9dde6051634a85359eb809bf2142': flv: Make onTextData parsing robust Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flv: Make onTextData parsing robustLuca Barbato2013-09-22
| | | | | | | | Certain streaming servers do not preserve the order of the fields.
* | Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6': rtmp: Replace a magic number with a macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Replace a magic number with a macroLuca Barbato2013-09-22
| | | | | | | | 11 is the RTMP header size.
* | Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit '5840473890440dbe0bd2cce530ebb3d93e187ae6': rtmp: Rewrite embedded flv handling Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Rewrite embedded flv handlingLuca Barbato2013-09-22
| | | | | | | | | | | | Use update_offset() as done for rtmp audio, video and notifications and read update and write the fields instead of replacing them in the rtmp packet and then memcpying it to the output buffer.
* | Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit 'e40a0e822801d2485e4e555909d7a82713fa86a5': rtmp: Refactor get_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Refactor get_packetLuca Barbato2013-09-22
| |
* | Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'Michael Niedermayer2013-09-23
|\| | | | | | | | | | | | | * commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2': rtmp: Support AMF_DATA_TYPE_MIXEDARRAY Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Support AMF_DATA_TYPE_MIXEDARRAYLuca Barbato2013-09-22
| | | | | | | | | | | | | | | | | | And fix the AMF_DATA_TYPE_ARRAY parsing while at it. A MIXEDARRAY type, as the ARRAY, store the number of elements in an uint32 before the list. The ARRAY is strict and does not have an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and a different than stated number of element can be present.
* | avformat/mov: reset extradata size when extradata gets deallocated due to ↵Michael Niedermayer2013-09-22
| | | | | | | | | | | | | | | | realloc failure This prevents the fields from becoming inconsistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenchint: use realloc_array() to protect against integer overflowMichael Niedermayer2013-09-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenchint: only change queue size if reallocation succeededMichael Niedermayer2013-09-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenchint: revert "Use av_reallocp() where suitable"Michael Niedermayer2013-09-22
| | | | | | | | | | | | | | reverts movenchin part of 5626f994f273af80fb100d4743b963304de9e05c The change left the fields in an inconsistent state Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hls: do not limit manifest lines to 1024 charsMichael Niedermayer2013-09-21
| | | | | | | | | | | | Fixes Ticket2976 Debuged-by: jaimeMF Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 07:46:50 +0000