summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functionsShivraj Patil2015-06-02
| | | | | | | | | This patch adds MSA (MIPS-SIMD-Arch) optimizations for HEVC bi mc functions (qpel as well as epel) in new file hevc_mc_bi_msa.c Adds new generic macros (needed for this patch) in libavutil/mips/generic_macros_msa.h Adds HEVC specific macros (needed for this patch) in libavcodec/mips/hevc_macros_msa.h Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '8349bedfa5eac7f261ac43053a2f66b894bac288'Michael Niedermayer2015-06-01
|\ | | | | | | | | | | | | * commit '8349bedfa5eac7f261ac43053a2f66b894bac288': configure: Remove some unnecessary exported config items Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Remove some unnecessary exported config itemsMartin Storsjö2015-06-01
| | | | | | | | | | | | | | | | The only need to be listed if they are to be used in ifdefs from within the code - config items used as dependencies only within configure don't need to be exported. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit 'ff7ae4b9df6e89d99dbd5434408123b80a4f6cd7': configure: Require LPDIRECT3DSURFACE9 for dxva2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Require LPDIRECT3DSURFACE9 for dxva2Martin Storsjö2015-06-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes dxva2 detection (i.e. correctly realizes that it isn't available) for WinRT, where dxva2api.h does exist, but these definitions are omitted (when targeting the API subsets). Ideally we should rather check for e.g. DXVA2_ConfigPictureDecode, but configure might fail to find that definition due to _WIN32_WINNT not being set to the right value during configure. (libavcodec/dxva2.h manually overrides the _WIN32_WINNT define.) This allows removing hardcoded --disable-dxva2 from such build configurations. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '172b2cee17a3779c114ba065dd7b25dcf61e408f'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '172b2cee17a3779c114ba065dd7b25dcf61e408f': dxva2: Add ifdefs around structs that might not be available Conflicts: libavcodec/dxva2.c See: 94d07b314aa516284cc21ea720d4a305f881b6c2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Add ifdefs around structs that might not be availableMartin Storsjö2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | configure: don't enable any tls protocol if network is disabledJames Almer2015-06-01
| | | | | | | | | | | | | | This was a regression introduced with 4a006b9eb7e7d736fd00e6045b5612978ef6404b. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/snowenc: avoid floats in the rangecoder initializationMichael Niedermayer2015-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/rangecoder: avoid float operationMichael Niedermayer2015-06-01
| | | | | | | | | | | | Use integers, avoid potential rounding issues Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/Makefile: fix checkheaders for nvenc_bJames Almer2015-06-01
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | doc/formats.texi: document max_interlave_delta muxing optionStefano Sabatini2015-06-01
| | | | | | | | | | | | | | The option was added in commit d9ae1031f5edbd25c8526b4cb51aba66d3bee931 but it was never documented. The text is based on the one written by the commit author for the corresponding AVFormatContext.max_interleave_delta field.
* | avformat/movenc: Fix potential signed overflowsMichael Niedermayer2015-06-01
| | | | | | | | | | | | Fixes CID1302838 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: clamp final zero MV if find_ref_mvs() found no suitable candidates.Ronald S. Bultje2015-06-01
| | | | | | | | | | | | This may actually result in a non-zero MV. Fixes ticket 4583. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '28fa58cf5d939151108345d7ddddebbd51d9b684'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '28fa58cf5d939151108345d7ddddebbd51d9b684': dxva2: Fix build when only D3D11 or DXVA2 is used Conflicts: libavcodec/dxva2_internal.h See: 94d07b314aa516284cc21ea720d4a305f881b6c2 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Fix build when only D3D11 or DXVA2 is usedSteve Lhomme2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '31de41babcd96f8ac2e6632454737aecb3710df7'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '31de41babcd96f8ac2e6632454737aecb3710df7': configure: Check if ID3D11VideoDecoder exists, not just the header to enable d3d11va Conflicts: configure See: a838b22bd9f75028cdfb55bf9b322b3f3544421b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Check if ID3D11VideoDecoder exists, not just the header to enable ↵Steve Lhomme2015-06-01
| | | | | | | | | | | | | | | | | | d3d11va Fixes build with some mingw-w64 versions, that have got the header but not the interface declaration. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | * commit '08d006f5a8ae0faef76d3dccea699c3af3db5b63': h264: Fix HWACCEL_MAX for D3D11 See: 1b236541a6b55da6ddc73fadd9a252c7e4bfb55f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Fix HWACCEL_MAX for D3D11Michael Niedermayer2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '674b79148ff29f40cbd569f5585bf99c71204bf5'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | * commit '674b79148ff29f40cbd569f5585bf99c71204bf5': hevc: Fix HWACCEL_MAX for D3D11 See: 688147cfe2d14bf24d185eb7299be01e511582ba Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: Fix HWACCEL_MAX for D3D11Michael Niedermayer2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | avutil/float_dsp: Fix ambiguous wording about vector productsMichael Niedermayer2015-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfenc: Correct klv_fill_keyMichael Niedermayer2015-06-01
| | | | | | | | | | | | | | See SMPTE 377-1-2009 6.3.3 KLV Fill Items Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit '63ce9fd23cfa5ac0d9a862be0da138108dc1c505': rtmpdh: Use GMP functions directly, instead of nettle wrappers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Use GMP functions directly, instead of nettle wrappersMartin Storsjö2015-06-01
| | | | | | | | | | | | | | | | | | mpz_import and mpz_export were added in GMP 4.1, in 2002. This simplifies the DH code by clarifying that it only uses pure bignum functions, no other parts of nettle/hogweed. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | * commit '84c5ff911f3f0557c8f97a964f74ceb01dd6d214': rtmpdh: Fix the indentation in a struct Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmpdh: Fix the indentation in a structMartin Storsjö2015-06-01
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | nvenc: remove cuda.h requirement for nvenc_aJames Almer2015-06-01
| | | | | | | | | | Reviewed-by: Philip Langdale <philipl@overt.org> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/ppc/pixblockdsp: Fix type of get_pixels_vsx()Michael Niedermayer2015-06-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil/ppc/cpu: Remove !ARCH_PPC64 check for mfspr, the code should now ↵Michael Niedermayer2015-06-01
| | | | | | | | | | | | support ppc64 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/utils: Simplify get_std_framerate() checkMichael Niedermayer2015-06-01
| | | | | | | | | | | | This also avoids using a floating point operation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b08caa87c35a768ec0abb16b1e99c3a85f1df28e': nvenc: H264 and HEVC encoders Conflicts: Changelog configure libavcodec/Makefile libavcodec/version.h This implementation is merged under the name nvenc_b* Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nvenc: H264 and HEVC encodersLuca Barbato2015-05-31
| | | | | | | | | | | | Partially based on the work of Timo Rothenpieler <timo@rothenpieler.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avcodec: Rename nvenc.c to nvenc_a.c, to avoid conflict with the other ↵Michael Niedermayer2015-06-01
| | | | | | | | | | | | implementation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | * commit '522d971c7f5921bebcea2fc50e67056afdabb951': xsub: Check memory allocation Conflicts: libavcodec/xsubdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * xsub: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | * commit '83797da6e36c1aadd85f41ca237dce823fc7bfa1': wma: Check memory allocation See: 8559a714155a7bc79d4802558f509e211379a8a0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wma: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit 'e1ea365f7e1477c78865b866a180712174536c20'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e1ea365f7e1477c78865b866a180712174536c20': truemotion2: Check memory allocation Conflicts: libavcodec/truemotion2.c See: d49f2603bedb780a6cedff4ac790605679cf4029 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * truemotion2: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '28fb80dcbf6f63eedfcfffc725a6bf0069d03fab': svq1: Check memory allocation Conflicts: libavcodec/svq1enc.c See: 2a3af77284412b56eb0085f4b97d9db5aa04a64f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq1: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit '42df71d9bbb1a5b4bce0bb34417692565c72d390'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | | | * commit '42df71d9bbb1a5b4bce0bb34417692565c72d390': ratecontrol: Check memory allocation Conflicts: libavcodec/ratecontrol.c See: 0898a6d4e4b669704fce663f610aa43dd7483fe9 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ratecontrol: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit '0994e142132200c706f704271b5a7ae81d128f5c'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | * commit '0994e142132200c706f704271b5a7ae81d128f5c': pthread: Check memory allocation Conflicts: libavcodec/pthread_frame.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | | | | | * commit '03927cb73399e6f07185fc7f8851d7612b4187b6': psymodel: Check memory allocation Conflicts: libavcodec/psymodel.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * psymodel: Check memory allocationVittorio Giovara2015-05-31
| |
* | Merge commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91'Michael Niedermayer2015-06-01
|\| | | | | | | | | | | | | | | * commit 'fef2f4722bcbfe1c3802898b0f5deb6356132c91': xvid: Check memory allocation See: 5c95de150f3b18f2e76fed670d6ea579feab1206 and others Merged-by: Michael Niedermayer <michaelni@gmx.at>