summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521'Clément Bœsch2017-03-24
|\ | | | | | | | | | | | | * commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521': Remove some pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
| * Remove some pointless TRACE level debug codeDiego Biurrun2016-10-27
| | | | | | | | This also kills some warnings with certain compiler options.
* | Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea': nut: Drop pointless TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
| * nut: Drop pointless TRACE level debug codeDiego Biurrun2016-10-27
| | | | | | | | The code has little usefulness and uses the __PRETTY_FUNCTION__ GNU extension.
* | Merge commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206': nsv: Drop unnecessary TRACE level debug code Merged-by: Clément Bœsch <u@pkh.me>
| * nsv: Drop unnecessary TRACE level debug codeDiego Biurrun2016-10-27
| | | | | | | | The output is rather silly and the code uses non-standard __FUNCTION__.
* | Merge commit '47756f51fe836959ffa5c6e2baeacbd71e150069'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '47756f51fe836959ffa5c6e2baeacbd71e150069': dnxhdenc: Drop pointless, commented-out debug output Merged-by: Clément Bœsch <u@pkh.me>
| * dnxhdenc: Drop pointless, commented-out debug outputDiego Biurrun2016-10-27
| |
* | Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '0456e684394dc5a7b98ab9ebb48396d743bf3730': audio_fifo: Drop write-only variable Merged-by: Clément Bœsch <u@pkh.me>
| * audio_fifo: Drop write-only variableDiego Biurrun2016-10-27
| |
* | Merge commit '0574780d7a196f87ddd89d6362f4c47f3532b4c4'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '0574780d7a196f87ddd89d6362f4c47f3532b4c4': h264_loopfilter: Do not print value of uninitialized variable Merged-by: Clément Bœsch <u@pkh.me>
| * h264_loopfilter: Do not print value of uninitialized variableDiego Biurrun2016-10-27
| | | | | | | | libavcodec/h264_loopfilter.c:531:111: warning: variable 'edge' is uninitialized when used here [-Wuninitialized]
* | Merge commit '255526998501f0040ae43fe4848c817a97fc578a'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '255526998501f0040ae43fe4848c817a97fc578a': mpegaudio: Do not print value of uninitialized variable Merged-by: Clément Bœsch <u@pkh.me>
| * mpegaudio: Do not print value of uninitialized variableDiego Biurrun2016-10-27
| | | | | | | | libavcodec/mpegaudiodec_template.c:885:97: warning: variable 'x' is uninitialized when used here [-Wuninitialized]
* | Merge commit '14cab426b03afd08bc9fe9b6e021a9543c4bdd7e'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '14cab426b03afd08bc9fe9b6e021a9543c4bdd7e': build: Hardcode avversion.h dependency This commit is a noop, see: 4d0ac9aee920cd95c35fbf4cd0a073baf86ff4c2 4ae87554f3c8bc54db572873f5049427a7e6cb31 Merged-by: Clément Bœsch <u@pkh.me>
| * build: Hardcode avversion.h dependencyDiego Biurrun2016-10-27
| | | | | | | | | | | | | | Since avversion.h is a generated header it must be created before dependencies can be determined as a side effect of compilation. Otherwise Make stops and restarts the build process to generate avversion.h and produces related error messages.
* | Merge commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | * commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c': openssl: Avoid double semicolons after the GET_BIO_DATA macro This commit is a noop, see fc83de7e1d0eab29942b4ceb67b49e66e7b99226 Merged-by: Clément Bœsch <u@pkh.me>
| * openssl: Avoid double semicolons after the GET_BIO_DATA macroMartin Storsjö2016-10-25
| | | | | | | | | | | | | | | | | | | | | | When the macro is expanded with a semicolon following it and the macro itself contains a semicolon, we ended up in double semicolons, which is treated as a statement that disallows further declarations. This avoids errors about mixed declarations and statements on gcc, after ee050797664c. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '052b97855de2396e46682bcbae97f95a258816d4'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '052b97855de2396e46682bcbae97f95a258816d4': aviocat: Support avio options Merged-by: Clément Bœsch <u@pkh.me>
| * aviocat: Support avio optionsLuca Barbato2016-10-25
| | | | | | | | Useful to test protocols that require options to be used.
* | Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | * commit '99aeae20de4d09ea313fdc619d4e2df825155e62': scale_npp: fix passthrough mode This commit is a noop, see f524275ef93882f27c0067e85e8fb3c0fc1a762b Merged-by: Clément Bœsch <u@pkh.me>
| * scale_npp: fix passthrough modeYogender Gupta2016-10-25
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0aec37e625821040c103641eec9c1e7a1efa2952'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | * commit '0aec37e625821040c103641eec9c1e7a1efa2952': vaapi_decode: Remove vestigial unmap code vaapi_decode: Clear parameter buffers to fix picture reuse This merge is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_decode: Remove vestigial unmap codeMark Thompson2016-10-24
| | | | | | | | | | | | | | The buffer map/unmap code was in an early version of this before it was committed, but the unmap was never removed. While wrong, this was harmless (and therefore unnoticed) because the buffers can't be mapped at this point - all drivers just did nothing with the call.
| * vaapi_decode: Clear parameter buffers to fix picture reuseMark Thompson2016-10-24
| | | | | | | | | | | | When decoding interlaced pictures, the structure is reused to render to the same surface twice. The parameter buffers were not being cleared, which caused the i965 driver to error out.
* | Merge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | * commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac': vaapi_h264: fix RefPicList[] field flags. This commit is a noop, see 88325c2e0b63abf4c3482cecd43870015123764a Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_h264: fix RefPicList[] field flags.Gwenole Beauchesne2016-10-24
| | | | | | | | | | | | | | | | | | | | | | Use new H264Ref.reference field to track field picture flags. The H264Picture.reference flag in DPB is now irrelevant here. This is a regression from git commit a12d3188, and that affected multiple interlaced video streams. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ee050797664c7c74cae262ffab05006b55d47a11': openssl: Support version 1.1.0. This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9 Included the simplifications by Martin Storsjö and fixed the GET_BIO_DATA() macro to prevent a warning after the simplifications. Merged-by: Clément Bœsch <u@pkh.me>
| * openssl: Support version 1.1.0.Matt Oliver2016-10-23
| | | | | | | | | | | | | | Further simplifications by Martin Storsjö, to minimize the diff. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94': rtmpdh: Don't use the OpenSSL DH struct Merged-by: Clément Bœsch <u@pkh.me>
| * rtmpdh: Don't use the OpenSSL DH structMartin Storsjö2016-10-23
| | | | | | | | | | | | | | | | | | Instead use our own struct, which we already use when using gcrypt and gnutls. In OpenSSL 1.1, the DH struct has been made opaque. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '2f806622e1270d3ed1d41a53049a19673dafbe70': bktr: Use memset(0) instead of zero initialization for struct sigaction Merged-by: Clément Bœsch <u@pkh.me>
| * bktr: Use memset(0) instead of zero initialization for struct sigactionDiego Biurrun2016-10-22
| | | | | | | | | | | | | | | | sigaction is not defined in standards as a struct starting with another struct. Some *BSD variants do however, resulting in a warning from the zero initialization, which this change eliminates. This partially reverts a92be9b856bd11b081041c43c25d442028fe9a63.
* | Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit 'ed48a9d8143d2575a4458589cebde69ec326afd8': checkasm: Add a test for HEVC add_residual Merged-by: Clément Bœsch <u@pkh.me>
| * checkasm: Add a test for HEVC add_residualAlexandra Hájková2016-10-22
| |
* | Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b': hevc: x86: Add add_residual() SIMD optimizations See a6af4bf64dae46356a5f91537a1c8c5f86456b37 This merge is only cosmetics (renames, space shuffling, etc). The functionnal changes in the ASM are *not* merged: - unrolling with %rep is kept - ADD_RES_MMX_4_8 is left untouched: this needs investigation Merged-by: Clément Bœsch <u@pkh.me>
| * hevc: x86: Add add_residual() SIMD optimizationsPierre Edouard Lepere2016-10-22
| | | | | | | | | | | | | | Initially written by Pierre Edouard Lepere <Pierre-Edouard.Lepere@insa-rennes.fr>, extended by James Almer <jamrial@gmail.com>. Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
* | lavc/x86/hevc: rename hevc_res_add to hevc_add_resClément Bœsch2017-03-24
| | | | | | | | This will simplify incoming merge.
* | Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | * commit '043b0b9fb1481053b712d06d2c5b772f1845b72b': Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v The merge also includes all our own occurences. Merged-by: Clément Bœsch <u@pkh.me>
| * Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|vDiego Biurrun2016-10-22
| |
* | Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | | | | | | | | | * commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e': mov: Update colr values Mostly noop, see a3cab3d43387add8914c1c471fc99d733227d81b Only the use of av_color_{primaries,transfer,space}_name() is merged. Merged-by: Clément Bœsch <u@pkh.me>
| * mov: Update colr valuesVittorio Giovara2016-10-21
| | | | | | | | | | | | | | | | | | | | For 'nclx', the latest edition of the standard switched from JPEG XR to 23001-8, which matches the current order of our entries. Bounds are preserved as a sanity check. For 'nclc', qtff edition 2016-09-13 introduced a few new entries. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'Clément Bœsch2017-03-24
|\| | | | | | | | | | | | | * commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104': lavu: Add JEDEC P22 color primaries Merged-by: Clément Bœsch <u@pkh.me>
| * lavu: Add JEDEC P22 color primariesVittorio Giovara2016-10-21
| |
* | lavu/pixfmt: fix redundant commentClément Bœsch2017-03-24
| | | | | | | | Mistake introduced in a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e.
* | Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'James Almer2017-03-23
|\| | | | | | | | | | | | | * commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c': Makefile: fix checking whether reconfiguring is required Merged-by: James Almer <jamrial@gmail.com>
| * Makefile: fix checking whether reconfiguring is requiredAnton Khirnov2016-10-21
| | | | | | | | | | It didn't take into account the new pattern used for bitstream filters and protocols.
* | Merge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'James Almer2017-03-23
|\| | | | | | | | | | | | | | | | | | | * commit '59c90097a0eff0dc81fbec15b8900c929859d1e7': hevc: factor out a repeated condition This commit is a noop. It doesn't apply as our codebase has diverged too much. Merged-by: James Almer <jamrial@gmail.com>
| * hevc: factor out a repeated conditionAnton Khirnov2016-10-21
| |
* | sws/tests/pixdesc_query: remove func wrappersClément Bœsch2017-03-24
| |