summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavc/arm: fix indent in blockdsp_init_neonClément Bœsch2017-03-201-2/+2
|
* Merge commit 'eea9857bfd6925d0c34382c00b971ee6df12ad44'Clément Bœsch2017-03-200-0/+0
|\ | | | | | | | | | | | | | | | | * commit 'eea9857bfd6925d0c34382c00b971ee6df12ad44': blockdsp: drop the high_bit_depth parameter This commit is a noop, see 562ba4a827ceb9ed5b7d056484a9c2312a5458c5 Merged-by: Clément Bœsch <[email protected]>
| * blockdsp: drop the high_bit_depth parameterAnton Khirnov2016-09-227-43/+34
| | | | | | | | | | It has no effect, since the code is supposed to operate the same way for any bit depth.
* | Merge commit '340f12f71207513672b5165d810cb6c8622c6b21'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '340f12f71207513672b5165d810cb6c8622c6b21': hwcontext_cuda: Add P010 and YUV444P16 pixel format This commit is a noop, we already have P010 and P016. 18:52 <@BtbN> Adding AV_PIX_FMT_YUV444P16 won't hurt, but doesn't gain anything. 18:53 <@BtbN> I'd say just noop it. If we'll ever need it, it will be added in turn. Merged-by: Clément Bœsch <[email protected]>
| * hwcontext_cuda: Add P010 and YUV444P16 pixel formatYogender Kumar Gupta2016-09-221-0/+22
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '75d98e30afab61542faab3c0f11880834653bd6b'Clément Bœsch2017-03-201-1/+1
|\| | | | | | | | | | | | | * commit '75d98e30afab61542faab3c0f11880834653bd6b': audiodsp/x86: clear the high bits of the order parameter on 64bit Merged-by: Clément Bœsch <[email protected]>
| * audiodsp/x86: clear the high bits of the order parameter on 64bitAnton Khirnov2016-09-191-1/+1
| | | | | | | | | | | | Also change shl to add, since it can be faster on some CPUs. CC: [email protected]
* | Merge commit '1d6c76e11febb58738c9647c47079d02b5e10094'Clément Bœsch2017-03-201-17/+17
|\| | | | | | | | | | | | | | | | | | | * commit '1d6c76e11febb58738c9647c47079d02b5e10094': audiodsp/x86: fix ff_vector_clip_int32_sse2 No functionnal changes, only cosmetics. This issue was fixed in 9a9e2f1c8aa4539a261625145e5c1f46a8106ac2. Merged-by: Clément Bœsch <[email protected]>
| * audiodsp/x86: fix ff_vector_clip_int32_sse2Anton Khirnov2016-09-191-18/+18
| | | | | | | | | | | | | | | | This version, which is the only one doing two processing cycles per loop iteration, computes the load/store indices incorrectly for the second cycle. CC: [email protected]
* | Merge commit '07e1f99a1bb41d1a615676140eefc85cf69fa793'Clément Bœsch2017-03-201-0/+10
|\| | | | | | | | | | | | | * commit '07e1f99a1bb41d1a615676140eefc85cf69fa793': x86util: Document SBUTTERFLY macro Merged-by: Clément Bœsch <[email protected]>
| * x86util: Document SBUTTERFLY macroAlexandra Hájková2016-09-191-0/+10
| | | | | | | | Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit 'de64dd13cbd47fd54334b6aa2a2cd3c7c36daae2'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'de64dd13cbd47fd54334b6aa2a2cd3c7c36daae2': avcodec: Add the extended pixel format profile for HEVC This commit is a noop, see 5a41999d81459297183c4e27618e38f8ba719853 Merged-by: Clément Bœsch <[email protected]>
| * avcodec: Add the extended pixel format profile for HEVCYogender Gupta2016-09-193-1/+5
| | | | | | | | | | | | It is supported by the NVIDIA video SDK 7. Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '136f55207521f0b03194ef5b55ba70f1635d6aee'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit '136f55207521f0b03194ef5b55ba70f1635d6aee': mpegvideo_motion: Handle edge emulation even without unrestricted_mv This commit is a noop, see 7b1e0beb2da31a0a8847bc9c68a87a120b71fa8a Merged-by: Clément Bœsch <[email protected]>
| * mpegvideo_motion: Handle edge emulation even without unrestricted_mvMichael Niedermayer2016-09-161-11/+8
| | | | | | | | | | | | | | | | Fix out of bounds read. Bug-Id: 962 Found by: F4B3CD@STARLAB and Agostino Sarubbo Signed-off-by: Vittorio Giovara <[email protected]>
* | Merge commit '15fcf6292ed79be274c824fedb099c2665f4cc15'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit '15fcf6292ed79be274c824fedb099c2665f4cc15': build: remove hardcoded name of version header This commit is noop, our version.sh is completely different. Merged-by: Clément Bœsch <[email protected]>
| * build: remove hardcoded name of version headerJanne Grunau2016-09-151-1/+1
| | | | | | | | | | | | Fixes an oversight in 1316df7aa98c4. CC: [email protected]
* | Merge commit '8c201dde0ab62e5cd581d958e78d7609e0ba710d'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | | | * commit '8c201dde0ab62e5cd581d958e78d7609e0ba710d': build: doc: more fine-grained dependencies for generated texi files This commit is a noop, we have a different system for handling the documentation. Merged-by: Clément Bœsch <[email protected]>
| * build: doc: more fine-grained dependencies for generated texi filesDiego Biurrun2016-09-151-4/+7
| |
* | configure: error out if jni is enabled and cannot be foundMatthieu Bouron2017-03-201-1/+1
| |
* | Merge commit 'bc7399934def210c2a84ea51375d50f79c676c96'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'bc7399934def210c2a84ea51375d50f79c676c96': libdc1394: Distinguish between enumeration errors and no cameras found This commit is a noop, see 384251daffb98d88b0fe897b341bb68445f885de Merged-by: Clément Bœsch <[email protected]>
| * libdc1394: Distinguish between enumeration errors and no cameras foundJosh de Kock2016-09-151-3/+8
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'df3795025337479a639cb3cd26c93a4e82ccd4db'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'df3795025337479a639cb3cd26c93a4e82ccd4db': rtsp: Fix a crash with the RTSP muxer This commit is a noop, see f8a13c72132a65e34e05b878dc780ad330dd7371 Merged-by: Clément Bœsch <[email protected]>
| * rtsp: Fix a crash with the RTSP muxerMartin Storsjö2016-09-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This was introduced in bc2a32969e. The whole block that the statement was added to is only relevant when used as a demuxer, but the other statements there have had other if statements guarding them. Make sure to only run this whole block if being used as a demuxer. CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit 'bdf7610eb266fd3de650040c97328791868abd82'Clément Bœsch2017-03-201-1/+11
|\| | | | | | | | | | | | | * commit 'bdf7610eb266fd3de650040c97328791868abd82': vf_scale_vaapi: Crop input surface to active region Merged-by: Clément Bœsch <[email protected]>
| * vf_scale_vaapi: Crop input surface to active regionMark Thompson2016-09-141-1/+11
| | | | | | | | | | | | If the input has been decoded from a stream which uses edge cropping then the whole surface need not be valid. This defines an input region for the scaler so we only use the active area of the frame.
* | Merge commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit '3a9662af6c741f8354b1ca97642f78f5c02e2e8f': vaapi_h264: Fix HRD bit_rate/cpb_size scaling This commit is a noop, see 06d73d002e7f911f26ae1548b46e442a6ece9a4a Merged-by: Clément Bœsch <[email protected]>
| * vaapi_h264: Fix HRD bit_rate/cpb_size scalingMark Thompson2016-09-141-4/+4
| | | | | | | | | | There should be an extra offset of 6 on bit_rate_scale and of 4 on cpb_size_scale which were not accounted for here.
* | Merge commit '7081620aca36e616ea96f71fd71d2703e3abae09'Clément Bœsch2017-03-200-0/+0
|\| | | | | | | | | | | | | | | | | * commit '7081620aca36e616ea96f71fd71d2703e3abae09': hwcontext_vdpau: Fix missing subscripts This commit is a noop, see f7e9275f83ec116fc859367d61998eae8af438fc Merged-by: Clément Bœsch <[email protected]>
| * hwcontext_vdpau: Fix missing subscriptsMark Thompson2016-09-141-2/+2
| | | | | | | | Also remove the redundant casts which were hiding the error here.
* | Merge commit '09a145b3c837273b1379321e44386a3233156e75'Clément Bœsch2017-03-201-25/+13
|\| | | | | | | | | | | | | * commit '09a145b3c837273b1379321e44386a3233156e75': hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK Merged-by: Clément Bœsch <[email protected]>
| * hwcontext_vdpau: Remove duplicate definition of GET_CALLBACKMark Thompson2016-09-141-24/+13
| |
* | Merge commit 'de452e503734ebb0fdbce86e9d16693b3530fad3'Clément Bœsch2017-03-2013-56/+58
|\| | | | | | | | | | | | | * commit 'de452e503734ebb0fdbce86e9d16693b3530fad3': pixblockdsp: Change type of stride parameters to ptrdiff_t Merged-by: Clément Bœsch <[email protected]>
| * pixblockdsp: Change type of stride parameters to ptrdiff_tDiego Biurrun2016-09-149-26/+25
| | | | | | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic. Also adjust parameter names to be "stride" everywhere.
* | avcodec/wmaprodec: reset offsets when error happensPaul B Mahol2017-03-201-0/+4
| | | | | | | | | | | | Fixes #6250. Signed-off-by: Paul B Mahol <[email protected]>
* | configure: add stdint.h to x264 and xavs checksRicardo Constantino2017-03-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Regression from 4563a86f011b54977b390c72ec3901cace35f8da. Both need stdint.h included before the respective x264.h and xavs.h. Old require() used different, separate checks that didn't actually need stdint.h to work. require2()'s (now require) check_func_headers() does include stdint.h but only after the custom headers. For libxavs this would also be consequently fixed by libav's commit 20abcaa273a6e77d0a2e1a98c643c73562c6f8f2 which wasn't merged yet.
* | avcodec/vp9: avx2 implementation of ipred_dl_16x16_16Ilia2017-03-202-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vp9_diag_downleft_16x16_10bpp_c: 263.0 vp9_diag_downleft_16x16_10bpp_sse2: 44.7 vp9_diag_downleft_16x16_10bpp_ssse3: 32.5 vp9_diag_downleft_16x16_10bpp_avx: 31.9 vp9_diag_downleft_16x16_10bpp_avx2: 25.7 vp9_diag_downleft_16x16_12bpp_c: 264.7 vp9_diag_downleft_16x16_12bpp_sse2: 44.4 vp9_diag_downleft_16x16_12bpp_ssse3: 32.0 vp9_diag_downleft_16x16_12bpp_avx: 32.4 vp9_diag_downleft_16x16_12bpp_avx2: 25.5 Benchmarked with 10000 runs Signed-off-by: Ilia <[email protected]> Signed-off-by: Ronald S. Bultje <[email protected]>
* | h264pred: added AVX2 implementation for tm_vp8 16x16.Mirage Abeysekara2017-03-202-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | checkasm --bench results with 5000 runs pred16x16_tm_vp8_c: 302.8 pred16x16_tm_vp8_mmx: 101.4 pred16x16_tm_vp8_mmxext: 95.5 pred16x16_tm_vp8_sse2: 95.1 pred16x16_tm_vp8_avx2: 38.2 Signed-off-by: Ronald S. Bultje <[email protected]>
* | wmavoice: remove unused or write-only variables.Ronald S. Bultje2017-03-201-27/+17
| |
* | Merge commit 'ab3554e1a7c04a5ea30f9c905de92348478ef7c8'Clément Bœsch2017-03-201-55/+40
|\| | | | | | | | | | | | | * commit 'ab3554e1a7c04a5ea30f9c905de92348478ef7c8': configure: Drop check_lib()/require() in favor of check_lib2()/require2() Merged-by: Clément Bœsch <[email protected]>
| * configure: Drop check_lib()/require() in favor of check_lib2()/require2()Diego Biurrun2016-09-131-36/+20
| | | | | | | | | | | | | | The latter can do everything the former can do, but also handle conditions the former cannot like multiple header #includes and checking for headers and functions in a single test program, which is necessary for certain library tests.
* | Merge commit '468bfe38c66d4d020984158e53b09a6a5749f394'Clément Bœsch2017-03-201-0/+5
|\| | | | | | | | | | | | | * commit '468bfe38c66d4d020984158e53b09a6a5749f394': ppc: mpegvideo: Add proper runtime AltiVec detection Merged-by: Clément Bœsch <[email protected]>
| * ppc: mpegvideo: Add proper runtime AltiVec detectionDiego Biurrun2016-09-111-0/+5
| |
* | Merge commit '6ce93757ee6b81fe727bfdc9f546fd0ddf9139c3'Clément Bœsch2017-03-201-3/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '6ce93757ee6b81fe727bfdc9f546fd0ddf9139c3': ppc: Update #endif comments This commit is mostly a noop as we seem to support PPC LE (see 902ce2a6c4364fd27ae3f1db78cd275caf79c006). Only the h264 chunks are updated. Merged-by: Clément Bœsch <[email protected]>
| * ppc: Update #endif commentsDiego Biurrun2016-09-1122-45/+44
| |
* | Merge commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc'Clément Bœsch2017-03-201-0/+32
|\| | | | | | | | | | | | | * commit 'caccb3a0cdc7ee32cbed7eab156d35025133eadc': audiodsp: ppc: Add VSX variant Merged-by: Clément Bœsch <[email protected]>
| * audiodsp: ppc: Add VSX variantLuca Barbato2016-09-111-0/+32
| | | | | | | | | | Signed-off-by: Luca Barbato <[email protected]> Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'e89cef40506d990a982aefedfde7d3ca4f88c524'Clément Bœsch2017-03-201-2/+3
|\| | | | | | | | | | | | | * commit 'e89cef40506d990a982aefedfde7d3ca4f88c524': checkasm: Read the unsigned value as it should Merged-by: Clément Bœsch <[email protected]>
| * checkasm: Read the unsigned value as it shouldLuca Barbato2016-09-111-2/+3
| | | | | | | | Reading a value larger than int using atoi() may give the wrong result.
* | Merge commit '75d642a944d5579e4ef20ff3701422a64692afcf'Clément Bœsch2017-03-201-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '75d642a944d5579e4ef20ff3701422a64692afcf': vaapi_vp8: Explicitly include libva vp8 decode header vaapi_decode: Ignore the profile when not useful lavc/vaapi: Add VP8 decode hwaccel vp8: Add hwaccel hooks This merge is a noop as these commits are already under review on the mailing list. doc/libav-merge.txt is updated to track its progress. Merged-by: Clément Bœsch <[email protected]>