summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Native VP9 decoder.Ronald S. Bultje2013-10-02
| | | | | Authors: Ronald S. Bultje <rsbultje gmail com>, Clement Boesch <u pkh me>
* Rewrite emu_edge functions to have separate src/dst_stride arguments.Ronald S. Bultje2013-09-28
| | | | | | This allows supporting files for which the image stride is smaller than the max. block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.
* vp8: use 2 registers for dst_stride and src_stride in neon bilin filter.Ronald S. Bultje2013-09-28
|
* lavf/mxfdec: add j2k codec to intra only codecsMatthieu Bouron2013-09-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/huffman: Allow specifying nb_bits to ff_huff_build_tree()Michael Niedermayer2013-09-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/utils: factor find_decoder() outMichael Niedermayer2013-09-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/vfq: fix deadlock in vqf_read_header()Paul B Mahol2013-09-28
| | | | | | Fixes #3010. Reported-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/dualinput: remove unused variablePaul B Mahol2013-09-28
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* libopenjpeg: fix encoding of odd sized subsampled imagesMichael Bradshaw2013-09-28
| | | | | Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Convert multiplier for MV from int to ptrdiff_t.Ronald S. Bultje2013-09-28
| | | | | | | This prevents emulated_edge_mc from not undoing mvy*stride-related integer overflows. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-28
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: lavfi: allow user-provided execute() callbacks Conflicts: libavfilter/avfilter.h libavfilter/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavfi: allow user-provided execute() callbacksAnton Khirnov2013-09-28
| |
* | Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'Michael Niedermayer2013-09-28
|\| | | | | | | | | | | | | | | | | | | * commit '38e15df1489d86c016515223ee693e7d0326c56a': avframe: note that linesize is not the usable data size Conflicts: libavutil/frame.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avframe: note that linesize is not the usable data sizeAnton Khirnov2013-09-28
| |
* | avcodec/imc: Check flcoeffs5Michael Niedermayer2013-09-27
| | | | | | | | | | | | | | Fixes infinite loop Fixes Ticket2996 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: add phase testPaul B Mahol2013-09-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter: add av_cold to init()Paul B Mahol2013-09-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/mlpdec: Fail if the input is too smallMichael Niedermayer2013-09-27
| | | | | | | | | | | | | | This fixes a infinite loop Fixes Ticket2986 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: check sample size more completelyMichael Niedermayer2013-09-27
| | | | | | | | | | | | | | Fixes division by zero Fixes Ticket2992 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/vidstabtransform: update optzoom range values for recent vid.stab ↵Georg Martius2013-09-27
| | | | | | | | | | | | update. Signed-off-by: Georg Martius <martius@mis.mpg.de>
* | avformat/tls: fix {} error for the GNUTLS caseMichael Niedermayer2013-09-27
| | | | | | | | | | Found-by:" Geek.Song" <ffmpeg@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avfilter/af_ladspa: set output channel layout for passthrough casePaul B Mahol2013-09-27
| | | | | | | | | | | | | | | | For cases when plugin does not return any samples we just return input samples. Previously channel layout for outlink was not set. Set it explicitly instead. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_ladspa: allow changing controls dynamicallyPaul B Mahol2013-09-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/af_ladspa: refactor code setting input control ports valuesPaul B Mahol2013-09-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | * qatar/master: lxf: check the nb_streams instead of relying on padding Conflicts: libavformat/lxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lxf: check the nb_streams instead of relying on paddingLuca Barbato2013-09-27
| | | | | | | | | | | | | | Remove the now unneeded stream pointer while at it. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | * commit 'a529fa2f4dd3292ba7d9cd3e6ba76425b1ba7aef': lxf: remove deplanarization hack See: 37e2a9783fd07558e2ce49b7cf2f617bf500f512 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lxf: remove deplanarization hackPaul B Mahol2013-09-27
| | | | | | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e52080cb18332cb1da9fe133498750b6b4b0fb3': pcm: support 24-bit/32-bit little-endian planar Conflicts: doc/general.texi libavcodec/Makefile libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/pcm.c libavcodec/version.h libavformat/nut.c See: 467dfd5dfae7cc435a2b2e7cf012a0de2fea5848 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pcm: support 24-bit/32-bit little-endian planarPaul B Mahol2013-09-27
| | | | | | | | | | | | Used by LXF. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '839df90c718dcab9b9e91ca3c7e73479b3e8103c'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lxf: Support 16-channel filesCarl Eugen Hoyos2013-09-27
| | | | | | | | | | | | Reported, analyzed and tested by Gabriel Gerard. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * lxf: Support version 1 filesReimar Döffinger2013-09-27
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | * 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>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | 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>
* | avcodec/parser: reset indexes on realloc failureMichael Niedermayer2013-09-26
| | | | | | | | | | | | Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-09-26
|\| | | | | | | | | | | | | | | * qatar/master: g2meet: Respect cursor_stride properly everywhere See: c88ac1e0233f34582312dc617261b9270b61df19 Merged-by: Michael Niedermayer <michaelni@gmx.at>