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
2013-09-27avformat/mxfdec: check sample size more completelyMichael Niedermayer
Fixes division by zero Fixes Ticket2992 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27avformat/tls: fix {} error for the GNUTLS caseMichael Niedermayer
Found-by:" Geek.Song" <ffmpeg@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: lxf: check the nb_streams instead of relying on padding Conflicts: libavformat/lxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'Michael Niedermayer
* commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c': lxf: Support 16-channel files lxf: Support version 1 files Conflicts: libavformat/lxfdec.c See: e701b0cf7553202085840d3bfd1aff432b4de513 See: 1a06d6dd866318b49596c0bf5ed03917f952d3bd Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'Michael Niedermayer
* commit '06ebc0bf9a6401733a4ce1310325de19f631819a': lavf: Allocate arrays with av_realloc if they will be realloced later Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit '1af78b865b66acb8020c54262f12aa41ad47e05c'Michael Niedermayer
* commit '1af78b865b66acb8020c54262f12aa41ad47e05c': rtpdec_qt: Add an accidentally removed allocation return value check Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93'Michael Niedermayer
* 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>
2013-09-27Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'Michael Niedermayer
* commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1': http: Pass options through to the nested protocol Conflicts: libavformat/http.c See: b6f435fbc87c024f8403fca69e6e6b98bccf93fa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27Merge commit '8b09d917e7dc7d7f2ace31419f802d4ff518236c'Michael Niedermayer
* 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>
2013-09-27lxf: check the nb_streams instead of relying on paddingLuca Barbato
Remove the now unneeded stream pointer while at it. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-09-27lxf: remove deplanarization hackPaul B Mahol
Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-09-27lxf: Support 16-channel filesCarl Eugen Hoyos
Reported, analyzed and tested by Gabriel Gerard. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27pcm: support 24-bit/32-bit little-endian planarPaul B Mahol
Used by LXF. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27lxf: Support version 1 filesReimar Döffinger
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-09-27lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö
failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-27lavf: Allocate arrays with av_realloc if they will be realloced laterMartin Storsjö
Pointers returned from av_malloc can't in general be passed to av_realloc. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-27rtpdec_qt: Add an accidentally removed allocation return value checkMartin Storsjö
This check was mistakenly removed in 5626f994f. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-27tls: Add support for listen modeMartin Storsjö
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>
2013-09-27http: Pass options through to the nested protocolMartin Storsjö
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>
2013-09-27tls: Add options for verifying the peer certificateMartin Storsjö
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>
2013-09-26avformat/mpegts: check avio_tell() return code before using itMichael Niedermayer
Fixes Ticket2962 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/wavdec: check smv_frames_per_jpegMichael Niedermayer
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>
2013-09-26avformat/mpegenc: minor simplification / use AV_WB16()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: Better heuristic for ordering packetsMichael Niedermayer
This prevents underflows in quite constrained cases Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: Better default for max_delayMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: change assert to av_assert0Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-26avformat/mpegenc: improve field names in underflow error messageMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-25Merge commit '668643b9239c70b777aea322eab411ebc960d9a0'Michael Niedermayer
* commit '668643b9239c70b777aea322eab411ebc960d9a0': matroskadec: check av_strdup() when setting defaults Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-24matroskadec: check av_strdup() when setting defaultsAnton Khirnov
2013-09-24avformat/omadec: simplify checks in nprobe()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494'Michael Niedermayer
* commit 'f2b00a5372bfa1d82a8ab99cb8eafac8a9473494': movenc: Return a proper error code for invalid combinations Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'Michael Niedermayer
* commit 'f7e616959aff8706edccdae763c24c897c449f6f': electronicarts: Check packet sizes before reading Conflicts: libavformat/electronicarts.c See: fb1ea777b3a01be6d71a103529ad37982707cacc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4'Michael Niedermayer
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4': lavf: Avoid setting avg_frame_rate if delta_dts is negative Conflicts: libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'Michael Niedermayer
* commit 'f1eac2b8a0370b908cd691086d11f51342054730': movenc: Use keyframes as default fragmentation point in ismv Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'Michael Niedermayer
* commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd': movenc: Set all implicit flags immediately in mov_write_header Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'Michael Niedermayer
* commit '187023f6b2b43966acb2449a379b4ededdc4b22e': movenc: Set mov->mode earlier in mov_write_header Conflicts: libavformat/movenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'Michael Niedermayer
* commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3': tls: Do not abort on non-fatal TLS alerts with gnutls Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'Michael Niedermayer
* commit 'c951e4b442df9dde6051634a85359eb809bf2142': flv: Make onTextData parsing robust Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'Michael Niedermayer
* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6': rtmp: Replace a magic number with a macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'Michael Niedermayer
* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6': rtmp: Rewrite embedded flv handling Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'Michael Niedermayer
* commit 'e40a0e822801d2485e4e555909d7a82713fa86a5': rtmp: Refactor get_packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'Michael Niedermayer
* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2': rtmp: Support AMF_DATA_TYPE_MIXEDARRAY Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22movenchint: Clear size and len if the realloc failedMartin Storsjö
Previously these were left in an inconsistent state. Pointed out by Michael Niedermayer. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22movenc: Return a proper error code for invalid combinationsMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22electronicarts: Check packet sizes before readingMartin Storsjö
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
2013-09-22lavf: Avoid setting avg_frame_rate if delta_dts is negativeMartin Storsjö
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>
2013-09-22avformat/mov: reset extradata size when extradata gets deallocated due to ↵Michael Niedermayer
realloc failure This prevents the fields from becoming inconsistent Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-22movenc: Use keyframes as default fragmentation point in ismvMartin Storsjö
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>
2013-09-22movenc: Set all implicit flags immediately in mov_write_headerMartin Storsjö
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 11:07:26 +0300