summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6'Michael Niedermayer2015-05-30
|\| | | | | | | | | | | | | * commit 'b2f0f37d242f1194fe1f886557cf6cefdf98caf6': rtmpdh: Generate the whole private exponent using av_get_random_seed() with nettle/gmp Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Generate the whole private exponent using av_get_random_seed() with ↵Martin Storsjö2015-05-29
| | | | | | | | | | | | | | | | | | nettle/gmp Don't use a PRNG for generating it; that defies the intended use within the cryptograhic handshake. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/tls: Support Secure TransportRodger Combs2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | configure: Fix showcqt fft dependancyMichael Niedermayer2015-05-29
| | | | | | | | | | Found-by: Muhammad Faiz <mfcc64@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | build: add configure option pkgconfigdirIngo Brückl2015-05-29
| | | | | | | | | | | | | | | | | | | | | | This allows the user to override the directory for the installation of the pkg-config files (from the default LIBDIR/pkgconfig). It follows the usual behaviour of Makefiles generated by automake. Signed-off-by: Ingo Brückl <ib@wupperonline.de> Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavutil: Cosmetic changes to fixed_dsp file.Nedeljko Babic2015-05-29
| | | | | | | | | | | | | | | | | | Names of functions vector_fmul_window_fixed_c and vector_fmul_window_fixed_scaled_c are changed by removing "_fixed" from the name since it is redundant. Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mov: fix DTS calculation for samples with negative stts durationAndreas Cadhalpun2015-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A negative sample duration is invalid according to the spec, but there are samples that use it for the DTS calculation, e.g.: http://files.1f0.de/samples/mp4-negative-stts-problem.mp4 These currently get out of A/V sync. Also change the logging type to AV_LOG_WARNING, because decoding the sample can continue. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avcodec/mpegvideo: Use FFSWAP to exchange pointersMichael Niedermayer2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/ac3_parser: Avoid floats in bitrate computationMichael Niedermayer2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: Check that track_width_1616 fits within the available 32bit ↵Michael Niedermayer2015-05-29
| | | | | | | | | | | | before storing it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/movenc: avoid floats in width/height/aspect ratio computationsMichael Niedermayer2015-05-29
| | | | | | | | | | | | This avoids the possibility for rounding/precision differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/concatdec: Enable auto_convert by defaultMichael Niedermayer2015-05-29
| | | | | | | | | | | | | | | | Users have no means to find out from a failure how to make it work or is it preferred to check and print a warning for h264 concat without auto_convert ? Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mov: Avoid float usage in yuv_to_rgba()Michael Niedermayer2015-05-29
| | | | | | | | | | | | This avoids the possibility for rounding/precision differences between platforms Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit 'e9e86d9ef637f5a600c76b352ffe5a82b71b25d1': rtmpdh: Create sufficiently long private keys for gcrypt/nettle Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Create sufficiently long private keys for gcrypt/nettleMartin Storsjö2015-05-29
| | | | | | | | | | | | | | There was a misunderstanding betewen bits and bytes for the parameter value for generating random big numbers. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8016a1bd3b60e917e1b12748dd80c06c3462c286'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '8016a1bd3b60e917e1b12748dd80c06c3462c286': rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Remove an unnecessary check in the gcrypt/nettle dh_compute_keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '063f7467e4d14ab7fe01b2845dab60cc75df8b53': rtmpdh: Add fate test for the DH handshake routine Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Add fate test for the DH handshake routineMartin Storsjö2015-05-29
| | | | | | | | | | | | | | This helps if these functions need to be implemented using another crypto API. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '0508faaa11bf7507ffdd655aee57c9dc5a8203f4': rtmpdh: Pass the actual buffer size of the output secret key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Pass the actual buffer size of the output secret keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '9f1b3050d9e31e9283d818f3640f3460ac8cfb5b': rtmpdh: Check the output buffer size in the openssl version of dh_compute_key Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Check the output buffer size in the openssl version of dh_compute_keyMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '127d813bcb5705202b7100cf1eccd1e26d72ba14'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '127d813bcb5705202b7100cf1eccd1e26d72ba14': rtmpdh: Fix a local variable name in the nettle/gcrypt codepath Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix a local variable name in the nettle/gcrypt codepathMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '78efc69e7c990226f4b913721ef1b308ca5bfa04'Michael Niedermayer2015-05-29
|\| | | | | | | | | | | | | * commit '78efc69e7c990226f4b913721ef1b308ca5bfa04': rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bn Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Make sure ret is initialized in the nettle version of bn_hex2bnMartin Storsjö2015-05-29
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | dxva2_hevc: re-write reference frame handlingHendrik Leppkes2015-05-29
| | | | | | | | | | | | | | The old logic required and explicit clearing of the lists first and was prone to overflow the DXVA2 struct in some circumstances. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dxva2_hevc: fix 32x32 scaling listsHendrik Leppkes2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Reset bitstream_buffer_size on allocation failureMichael Niedermayer2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegvideo: Check pointer when allocation failRoman Savchenko2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avienc: Correct possible dereference of nullRoman Savchenko2015-05-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | * commit 'a64a5773ea5f7337cd1d87cfdf511914d317fe81': pixfmt: remove misleading and broken documentation Conflicts: libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixfmt: remove misleading and broken documentationwm42015-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was probably broken some time ago. The breakage is now part of the ABI. For example, we have: AV_PIX_FMT_XYZ12BE AV_PIX_FMT_NV16 AV_PIX_FMT_NV20LE AV_PIX_FMT_NV20LE is wrong. It has the value 113, but as little-endian format it should be even. This must have been quite obvious when these formats were added (because of the AV_PIX_FMT_XYZ12BE entry), but nobody cared or knew about this. The future libavutil major bump will also break this additionally, because disabling FF_API_VDPAU will remove an odd number of entries from the middle of the enum. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e4610300de6869bd6b3b00e76cfeabb6d7653dcd': x86: cavs: Remove an unneeded scratch buffer Conflicts: libavcodec/x86/cavsdsp.c See: d79f7bf0d63a81ee66026ee92a6946a7303d04bd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: cavs: Remove an unneeded scratch bufferMichael Niedermayer2015-05-28
| | | | | | | | | | | | | | | | Simplifies the code and makes it build on certain compilers running out of registers on x86. CC: libav-stable@libav.org Reported-By: mudler
* | Merge commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | * commit '1b1bb2c4efc126d74d44d8c421860c85f932ecb1': rl: Add error checking to ff_rl_init(). Conflicts: libavcodec/rl.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rl: Add error checking to ff_rl_init().Anton Khirnov2015-05-28
| |
* | Merge commit '324e50ee95929a9491b855c5e15451145bd5d1ec'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | * commit '324e50ee95929a9491b855c5e15451145bd5d1ec': rl: Add a function for freeing dynamically allocated tables. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rl: Add a function for freeing dynamically allocated tables.Anton Khirnov2015-05-28
| | | | | | | | Such tables are not used anywhere currently, but that should change.
* | Merge commit '6f57375d707de40dcec28d3cef886c364e032c21'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '6f57375d707de40dcec28d3cef886c364e032c21': rl: Rename ff_*_rl() to ff_rl_*() Conflicts: libavcodec/mpeg4videodec.c libavcodec/rl.c libavcodec/rl.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rl: Rename ff_*_rl() to ff_rl_*()Anton Khirnov2015-05-28
| |
* | Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | | | | | * commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d': mpegvideo: Move ff_*_rl functions to a separate file Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Move ff_*_rl functions to a separate fileAnton Khirnov2015-05-28
| |
* | Merge commit '419e3404d07acaac019e8f363c281e17c3a3d622'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | * commit '419e3404d07acaac019e8f363c281e17c3a3d622': mpegvideo: Drop exchange_uv() function and use its code directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: Drop exchange_uv() function and use its code directlyVittorio Giovara2015-05-28
| | | | | | | | Code is small enough that there is no advantage in a separate function.
* | Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | * commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1': tls_gnutls: Add missing includes for the gcrypt thread safety callbacks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tls_gnutls: Add missing includes for the gcrypt thread safety callbacksMartin Storsjö2015-05-28
| | | | | | | | | | | | | | This fixes building with gcrypt-backed gnutls versions, broken in 57cde2b180. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dd4d709be705edaec0bc35c426bf8434e942b7df'Michael Niedermayer2015-05-28
|\| | | | | | | | | | | | | | | * commit 'dd4d709be705edaec0bc35c426bf8434e942b7df': x86inc: Clear __SECT__ See: 204b228a1d884343dbd974e6326a06901736b3b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Clear __SECT__Timothy Gu2015-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Silences warning(s) like: libavcodec/x86/fft.asm:93: warning: section flags ignored on section redeclaration The cause of this warning is that because `struc` and `endstruc` attempts to revert to the previous section state [1]. The section state is stored in the macro __SECT__, defined by x86inc.asm to be `.note.GNU-stack ...`, through the `SECTION` directive [2]. Thus, the `.note.GNU-stack` section is defined twice (once in x86inc.asm, once during `endstruc`), causing the warning. That is the first part of the commit: using the primitive `[section]` format for .note.GNU-stack etc., which does not update `__SECT__` [2]. That fixes only half of the problem. Even without any `SECTION` directives, `__SECT__` is predefined as `.text`, which conflicting with the later `SECTION_TEXT` (which expands to `.text align=16`). [1]: http://www.nasm.us/doc/nasmdoc6.html#section-6.4 [2]: http://www.nasm.us/doc/nasmdoc6.html#section-6.3 Signed-off-by: Luca Barbato <lu_zero@gentoo.org>