summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'James Almer2017-11-114-96/+1
|\ | | | | | | | | | | | | * commit '0af8a72174108b9bb482f1073a1e9a3bc258af51': build: Drop support for legacy TI ARM compiler Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop support for legacy TI ARM compilerDiego Biurrun2017-10-254-96/+1
| |
* | Merge commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5': hwcontext_vaapi: Set message callbacks on internally-created devices vaapi: Always free parameter buffers after vaEndPicture() with libva2 vaapi: Remove H.264 baseline profile configure: Add config option for libva2 (VAAPI 1) vaapi: Disable deprecation warnings around use of struct vaapi_context This commit is a noop, see 375cf55fe9f574e42bd3519f08993125ac66c725 9c7a71145b88e56cb5f67c66f6d27c20c8d06165 bd211bb866f8bf5c372589fc44dc06d1a9509c0a e339411691e3671b595e556ba3411c1acb8c4692 f3602875b3255c533900df1c7bb4e78ef5e1ce08 Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_vaapi: Set message callbacks on internally-created devicesMark Thompson2017-10-251-0/+21
| | | | | | | | | | The message callbacks are library-safe in libva2, so we can now use them.
| * vaapi: Always free parameter buffers after vaEndPicture() with libva2Mark Thompson2017-10-254-6/+6
| | | | | | | | | | | | This is an ABI change in libva2: previously the Intel driver had this behaviour and it was implemented as a driver quirk, but now it is part of the specification so all drivers must do it.
| * vaapi: Remove H.264 baseline profileMark Thompson2017-10-242-4/+4
| | | | | | | | | | | | This has been deprecated in libva2 because hardware does not and will not support it. Therefore never consider it for decode, and for encode assume the user meant constrained baseline profile instead.
| * configure: Add config option for libva2 (VAAPI 1)Mark Thompson2017-10-241-0/+5
| |
| * vaapi: Disable deprecation warnings around use of struct vaapi_contextMark Thompson2017-10-241-0/+3
| |
* | Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'James Almer2017-11-111-4/+2
|\ \ | |/ | | | | | | | | | | * commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb': arm: Remove a redundant check in fmtconvert_init_arm.c Merged-by: James Almer <jamrial@gmail.com>
| * arm: Remove a redundant check in fmtconvert_init_arm.cMartin Storsjö2017-10-241-4/+2
| | | | | | | | | | | | | | This was missed in e2710e790c0, where have_vfp && !have_vfpv3 were converted into have_vfp_vm. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '17f5171cd4753e7f50e6d95df069bccbc90265bf': arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp lavc: fix hw_device_ctx operation This commit is a noop, see 48e4eda11d537c6ed52d1000aaa6ce5cbb641e25 f1fd12ef858cf7efe843aa3063894a11b2d1e7d5 Merged-by: James Almer <jamrial@gmail.com>
| * arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfpMartin Storsjö2017-10-241-2/+2
| | | | | | | | | | | | | | This was missed in e2710e790c0 since those functions weren't exercised by checkasm. Signed-off-by: Martin Storsjö <martin@martin.st>
| * lavc: fix hw_device_ctx operationwm42017-10-231-4/+2
| | | | | | | | | | | | | | Commit b46a77f19d accidentally broke this (requested change that was added to the patch later and which was not fully tested). Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'James Almer2017-11-111-12/+20
|\ \ | |/ | | | | | | | | | | * commit '68649bfed30a35dc3e45ea240541b2774b2f282b': configure: Group system feature variables and system libraries together Merged-by: James Almer <jamrial@gmail.com>
| * configure: Group system feature variables and system libraries togetherDiego Biurrun2017-10-221-11/+19
| |
* | Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'James Almer2017-11-111-3/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'cbcdb2d8e47f62f69accee62c08f487a27848174': build: Delete compiler-generated compat files on 'make clean' See d100dc6c9955af8b7a7a60a37a362a51c819222e a2ca9e11ff7166cbbc0314d152702a201f6a14fb Merged-by: James Almer <jamrial@gmail.com>
| * build: Delete compiler-generated compat files on 'make clean'Diego Biurrun2017-10-191-0/+1
| |
* | Merge commit '62be1caf161c1241a9e148f347850cfe092588dc'James Almer2017-11-111-11/+11
|\ \ | |/ | | | | | | | | | | * commit '62be1caf161c1241a9e148f347850cfe092588dc': configure: Bail out early if neither static nor shared libs are built Merged-by: James Almer <jamrial@gmail.com>
| * configure: Bail out early if neither static nor shared libs are builtDiego Biurrun2017-10-191-11/+11
| |
* | Merge commit 'c6496de33456f20144b994ac38f308f2de333608'James Almer2017-11-111-2/+1
|\ \ | |/ | | | | | | | | | | * commit 'c6496de33456f20144b994ac38f308f2de333608': configure: Move enabling libc_type into probe_libc() function Merged-by: James Almer <jamrial@gmail.com>
| * configure: Move enabling libc_type into probe_libc() functionDiego Biurrun2017-10-191-2/+1
| |
* | avcodec/Makefile: build libxvid_rc.o only if libxvid_encoder is enabledJames Almer2017-11-111-2/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | nvdec: add frames_params supportwm42017-11-114-38/+57
| |
* | Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'James Almer2017-11-1127-181/+399
|\ \ | |/ | | | | | | | | | | | | | | * commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24': lavc: external hardware frame pool initialization Includes the fix from e724bdfffbd3c27aac53d1f32f20f105f37caef0 Merged-by: James Almer <jamrial@gmail.com>
| * lavc: external hardware frame pool initializationwm42017-10-1926-181/+395
| | | | | | | | | | | | | | | | | | | | | | | | This adds a new API, which allows the API user to query the required AVHWFramesContext parameters. This also reduces code duplication across the hwaccels by introducing ff_decode_get_hw_frames_ctx(), which uses the new API function. It takes care of initializing the hw_frames_ctx if needed, and does additional error handling and API usage checking. Support for VDA and Cuvid missing. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'James Almer2017-11-112-0/+27
|\ \ | |/ | | | | | | | | | | * commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d': FATE: add a test for the H.264 sample fixed by 7c4f6f6 Merged-by: James Almer <jamrial@gmail.com>
| * FATE: add a test for the H.264 sample fixed by 7c4f6f6Anton Khirnov2017-10-192-0/+23
| |
* | Revert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"James Almer2017-11-113-1/+14
| | | | | | | | | | | | | | This reverts commit 1a4315f24d2c5857ebeb379fe39f0124746ee30a, reversing changes made to 869401cefc22e221edbf135bacaa1f21014fd001. At least one distro (Arch) ships gsm.h inside the gsm/ folder
* | Merge commit '98afe3fb71afd4a18009924aaba56bc577bbd400'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '98afe3fb71afd4a18009924aaba56bc577bbd400': qsv: Make the hevc idr_interval consistent with the h264 one This commit is a noop, see 643e3369369f77035a6c03a50752416d26cbf947 Merged-by: James Almer <jamrial@gmail.com>
| * qsv: Make the hevc idr_interval consistent with the h264 oneLuca Barbato2017-10-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the MediaSDK documentation the idr_interval value has a different meaning depending on the codec: 0 in H264 means make every I-frame IDR, in HEVC it means to have it only at the beginning. 1 in H264 means every other I-frame is not-IDR, in HEVC it means that every I-frame is IDR. Keep the behaviour consistent between the two encoders by increasing by 1 internally the idr_interval value for HEVC.
* | Merge commit '41df62fd674bd0c67f7b6952381d235a393245d6'James Almer2017-11-111-0/+3
|\ \ | |/ | | | | | | | | | | * commit '41df62fd674bd0c67f7b6952381d235a393245d6': configure: Set the default assembler to armasm64 for MSVC for arm64 Merged-by: James Almer <jamrial@gmail.com>
| * configure: Set the default assembler to armasm64 for MSVC for arm64Martin Storsjö2017-10-181-0/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '732510636e597585a79be7d111c88b3f7e174fe7'James Almer2017-11-111-2/+2
|\ \ | |/ | | | | | | | | | | * commit '732510636e597585a79be7d111c88b3f7e174fe7': aarch64: Remove a dot from a label Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: Remove a dot from a labelMartin Storsjö2017-10-181-2/+2
| | | | | | | | | | | | This fixes building with armasm64 (when run through gas-preprocessor). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'James Almer2017-11-111-1/+1
|\ \ | |/ | | | | | | | | | | * commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d': aarch64: Get rid of a stray double space Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: Get rid of a stray double spaceMartin Storsjö2017-10-181-1/+1
| | | | | | | | | | | | | | | | The extra space got included as part of the expansion of ELF, which later interfered with gas-preprocessor which earlier only stripped out leftover lines starting with '#' if the line started with that char. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250': cbs: Add test dependencies mss1: Add missing macro parameters to ARITH_GET_* macros This commit is a noop, see cbeaf678889baeaac0776305f3ca289318a1aca7 809b0402dc916b876dfdd6bb9c88f171cf3e77c0 Merged-by: James Almer <jamrial@gmail.com>
| * cbs: Add test dependenciesMark Thompson2017-10-171-6/+11
| | | | | | | | Fixes the MPEG-2 failure with --disable-error-resilience.
| * mss1: Add missing macro parameters to ARITH_GET_* macrosDiego Biurrun2017-10-161-8/+8
| | | | | | | | | | It is wrong to pass no arguments to a macro that expects one argument and some compilers complain.
* | Merge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'James Almer2017-11-111-0/+5
|\ \ | |/ | | | | | | | | | | | | | | * commit '077011b5af2b3150efc52a9b58f5ef9bb0235087': qsv: Expose idr_interval for hevc as well Also includes 98afe3fb71afd4a18009924aaba56bc577bbd400. Merged-by: James Almer <jamrial@gmail.com>
| * qsv: Expose idr_interval for hevc as wellLuca Barbato2017-10-141-0/+1
| |
* | doc/libav-merge: mention more skipped outdev removal commitsJames Almer2017-11-111-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '762ab2de6ead68cfe6617d1960921878ddece9e1': Remove dv1394 input device avfoundation: Drop silly _dec suffix from filename alsa: Coalesce source files after outdev removal oss: Coalesce source files after outdev removal sndio: Coalesce source files after outdev removal This commit is a noop, see 56d2154b72fba96a65b806ecf4a6f85c3f69b021 Merged-by: James Almer <jamrial@gmail.com>
| * Remove dv1394 input deviceJosh de Kock2017-10-138-606/+1
| | | | | | | | | | | | | | | | Support for this device has been removed in the Linux kernel since v2.6.37. dv1394 has been superseded by libiec61883 which is functionally equivalent. Signed-off-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avfoundation: Drop silly _dec suffix from filenameDiego Biurrun2017-10-132-1/+1
| |
| * alsa: Coalesce source files after outdev removalDiego Biurrun2017-10-134-282/+182
| |
| * oss: Coalesce source files after outdev removalDiego Biurrun2017-10-134-198/+117
| |
| * sndio: Coalesce source files after outdev removalDiego Biurrun2017-10-134-174/+104
| |
* | doc/libav-merge: mention skipped outdev removal commitJames Almer2017-11-111-0/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46'James Almer2017-11-110-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46': Remove all output devices This commit is a noop. Such a change needs consensus from the project. Merged-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud