summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428'James Almer2017-03-21
|\ | | | | | | | | | | | | * commit '2ec9fa5ec60dcd10e1cb10d8b4e4437e634ea428': idct: Change type of array stride parameters to ptrdiff_t Merged-by: James Almer <jamrial@gmail.com>
| * idct: Change type of array stride parameters to ptrdiff_tDiego Biurrun2016-09-29
| | | | | | | | ptrdiff_t is the correct type for array strides and similar.
* | aacsbr: Turnoff in the event of over read.Alex Converse2017-03-21
| | | | | | | | | | | | | | | | | | | | Aliased compressed AAC bytes are almost certainly not meaningful SBR data. In the wild this causes harsh artifacts switching HE-AAC streams that don't have SBR headers aligned with segment boundaries. Turning off SBR falls back to a default set of upsampling parameters that can function as a sort of error concealment. This is consistent with how the decoder handles other sorts of errors.
* | swresample/resample: free existing ResampleContext on reinitJames Almer2017-03-21
| | | | | | | | | | | | | | | | Fixes memleak. Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* | swresample/resample: move resample_free() higher in the fileJames Almer2017-03-21
| | | | | | | | | | | | Also make it more readable while at it. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit 'b2939a75270bc7e971462648168aa3a2a48c1c8c': blockdsp: Change type of array stride parameters to ptrdiff_t Merged-by: Clément Bœsch <u@pkh.me>
| * blockdsp: Change type of array stride parameters to ptrdiff_tDiego Biurrun2016-09-29
| | | | | | | | ptrdiff_t is the correct type for array strides and similar.
* | Merge commit '3281d823cdc7601c4900eb103958c05f59f65555'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '3281d823cdc7601c4900eb103958c05f59f65555': intrax8: Change type of array stride parameters to ptrdiff_t Merged-by: Clément Bœsch <u@pkh.me>
| * intrax8: Change type of array stride parameters to ptrdiff_tDiego Biurrun2016-09-29
| | | | | | | | | | | | ptrdiff_t is the correct type for array strides and similar. Also rename all such parameters to "stride" for consistency.
* | Merge commit '92c5755a185086067fe49e7e64c23a8e7011be31'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '92c5755a185086067fe49e7e64c23a8e7011be31': hpeldsp: arm: Update comments left behind in 25841dfe806a13de526ae09c11149ab1f83555a8 Merged-by: Clément Bœsch <u@pkh.me>
| * hpeldsp: arm: Update comments left behind in ↵Diego Biurrun2016-09-29
| | | | | | | | 25841dfe806a13de526ae09c11149ab1f83555a8
* | Merge commit '009adfd4fbdd78a890a4a65d6f141c467bb027fa'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '009adfd4fbdd78a890a4a65d6f141c467bb027fa': x86: fpel: Remove unnecessary sign extend Merged-by: Clément Bœsch <u@pkh.me>
| * x86: fpel: Remove unnecessary sign extendDiego Biurrun2016-09-29
| |
* | Merge commit '956a54129db522998a5abae869568dae2c9774cb'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '956a54129db522998a5abae869568dae2c9774cb': vaapi_h264: Set max_num_ref_frames to 1 when not using B frames vaapi_encode: Sync to input surface rather than output vaapi_encode: Check packed header capabilities vaapi_encode: Refactor initialisation This merge is a noop, see: ee1d04f970 vaapi_h264: Set max_num_ref_frames to 1 when not using B frames 94f446c628 vaapi_encode: Sync to input surface rather than output 478a4b7e6d vaapi_encode: Check packed header capabilities c8241e730f vaapi_encode: Refactor initialisation Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_h264: Set max_num_ref_frames to 1 when not using B framesMark Thompson2016-09-28
| |
| * vaapi_encode: Sync to input surface rather than outputMark Thompson2016-09-28
| | | | | | | | | | | | | | | | | | While outwardly bizarre, this change makes the behaviour consistent with other VAAPI encoders which sync to the encode /input/ picture in order to wait for /output/ from the encoder. It is not harmful on i965 (because synchronisation already happens in vaRenderPicture(), so it has no effect there), and it allows the encoder to work on mesa/gallium which assumes this behaviour.
| * vaapi_encode: Check packed header capabilitiesMark Thompson2016-09-28
| | | | | | | | | | This improves behaviour with drivers which do not support packed headers, such as AMD VCE on mesa/gallium.
| * vaapi_encode: Refactor initialisationMark Thompson2016-09-28
| | | | | | | | | | | | | | | | This allows better checking of capabilities and will make it easier to add more functionality later. It also commonises some duplicated code around rate control setup and adds more comments explaining the internals.
* | Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | | | * commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb': examples/output: switch to the new encoding API This commit is a noop, our examples are different. Still, we need to update them to the new API, so doc/libav-merge.txt is updated. Merged-by: Clément Bœsch <u@pkh.me>
| * examples/output: switch to the new encoding APIAnton Khirnov2016-09-28
| |
* | Merge commit '7bf8db4db61eb09fac00eb665d8ec58de8817da6'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '7bf8db4db61eb09fac00eb665d8ec58de8817da6': tdsc: use the new decoding API Merged-by: Clément Bœsch <u@pkh.me>
| * tdsc: use the new decoding APIAnton Khirnov2016-09-28
| |
* | Merge commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | * commit 'de2ae3c1fae5a2eb539b9abd7bc2a9ca8c286ff0': lavc: add clobber tests for the new encoding/decoding API The merge only re-order what we already have. Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: add clobber tests for the new encoding/decoding APIAnton Khirnov2016-09-28
| |
* | vf_drawtext: Fix memory leakKieran Kunhya2017-03-21
| |
* | Merge commit '68811a41c70f019bde6df2a4f289674228c48958'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '68811a41c70f019bde6df2a4f289674228c48958': mpegvideo_enc: use the new encoding API for b_strategy=2 Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: use the new encoding API for b_strategy=2Anton Khirnov2016-09-28
| |
* | Merge commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit 'f03f78bc1c99b1e29624418e2f7315b8a47981e9': mpegvideo_enc: handle encoding errors with b_strategy=2 Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: handle encoding errors with b_strategy=2Anton Khirnov2016-09-28
| |
* | Merge commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit '6f733ecab6faff2a16534f2ce7d2ffd41c07846b': mpegvideo_enc: add const to the AVCodec instance Merged-by: Clément Bœsch <u@pkh.me>
| * mpegvideo_enc: add const to the AVCodec instanceAnton Khirnov2016-09-28
| |
* | Merge commit '6c09af7e46a5a1ada67ffe832f7895cf2749130b'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | * commit '6c09af7e46a5a1ada67ffe832f7895cf2749130b': APIchanges: fix a typo in the version number This commit is a noop (typo is not present in FFmpeg). Merged-by: Clément Bœsch <u@pkh.me>
| * APIchanges: fix a typo in the version numberAnton Khirnov2016-09-28
| |
* | Merge commit '0e8d1fc1f013eb805a7b66656d9452bcbca36d22'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '0e8d1fc1f013eb805a7b66656d9452bcbca36d22': lavu: Bump version for the 12bit Planar YUV support pixfmt: Add yuv444p12 pixel format pixfmt: Add yuv422p12 pixel format pixfmt: Add yuv420p12 pixel format This merge is a noop, we already have all these pixel formats. Merged-by: Clément Bœsch <u@pkh.me>
| * lavu: Bump version for the 12bit Planar YUV supportLuca Barbato2016-09-27
| |
| * pixfmt: Add yuv444p12 pixel formatLuca Barbato2016-09-27
| |
| * pixfmt: Add yuv422p12 pixel formatLuca Barbato2016-09-27
| |
| * pixfmt: Add yuv420p12 pixel formatLuca Barbato2016-09-27
| |
* | lavc/hwaccel: fix header copyrightClément Bœsch2017-03-21
| | | | | | | | | | | | | | | | | | It was done on a whim because of the FATE header check and was actually meant to be removed before pushing. Also, nobody in review spotted it. Reviewed-by: wm4
* | Merge commit '2b5b1e1e9b89063d352e2efed014f9d761b85032'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | | | | | * commit '2b5b1e1e9b89063d352e2efed014f9d761b85032': swscale: Rename is9_OR_10 to match what it does This commit is a noop. We use isNBPS() in these places instead since d736b52a04. is9_15BPS() wouldn't be a good name in our codebase due to supporting only up to 14 (see 2ea585b8e3). Merged-by: Clément Bœsch <u@pkh.me>
| * swscale: Rename is9_OR_10 to match what it doesLuca Barbato2016-09-27
| | | | | | | | It is used to select functions that work with 9-15bits.
* | Merge commit 'e87a501e7d03ac68b58520108fe24ad9d0b36765'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e87a501e7d03ac68b58520108fe24ad9d0b36765': swscale: Update bitdepth range check This commit is a noop. Up to 14 bits is supported since fa36f33422. This commits pushes the limit to 15 bits but we don't seem to have pixel formats that enters in that category. 12:03 <ubitux> so what's your opinion? should we move to 15 even if unused currently to make it consistent with libav and the function names, or keep our 14 suggesting there might be an issue with 15? 12:05 <ubitux> (functions are called hScale8To15_c, hScale16To15_c, ff_hscale8to15, ...) 12:06 <michaelni> I prefer to keep 14 until theres a case that allows us to test this and i suspect it will not work with 15 at least not all the code Merged-by: Clément Bœsch <u@pkh.me>
| * swscale: Update bitdepth range checkLuca Barbato2016-09-27
| | | | | | | | | | Make sure the scaling functions for the 9-15bits are used for 9-15bits bit depths correctly.
* | avcodec/fmvc: small refactoring in decode_type1()Diego Biurrun2017-03-21
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414'Clément Bœsch2017-03-21
|\| | | | | | | | | | | | | * commit 'de8e096c7eda2bce76efd0a1c1c89d37348c2414': swscale: Consistently order input YUV pixel formats Merged-by: Clément Bœsch <u@pkh.me>
| * swscale: Consistently order input YUV pixel formatsVittorio Giovara2016-09-27
| | | | | | | | | | | | | | Follow a 420, 422, 444 order instead of a random one. This simplifies double-checking additions of new formats. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ffmpeg: Initialize two stack variables.Carl Eugen Hoyos2017-03-21
| | | | | | | | Avoids reading from uninitialized memory, regression since af1761f7
* | avcodec: remove warning against using frame threading with hwaccelswm42017-03-21
| | | | | | | | | | | | | | libavcodec now automatically serializes decoding for hwaccels which are not thread-safe. This means API users, which rely on the libavcodec native software fallback mechanism, can now simply enable threading without running into problems.
* | pthread_frame: remove some dead codewm42017-03-21
| | | | | | | | Whatever it was supposed to do.
* | pthread_frame: do not run hwaccel decoding asynchronously unless it's safeAnton Khirnov2017-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Certain hardware decoding APIs are not guaranteed to be thread-safe, so having the user access decoded hardware surfaces while the decoder is running in another thread can cause failures (this is mainly known to happen with DXVA2). For such hwaccels, only allow the decoding thread to run while the user is inside a lavc decode call (avcodec_send_packet/receive_frame). Merges Libav commit d4a91e65. Signed-off-by: wm4 <nfxjfg@googlemail.com> Tested-by: Michael Niedermayer <michael@niedermayer.cc>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 20:05:24 +0000