summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '67deba8a416d818f3d95aef0aa916589090396e2'Clément Bœsch2017-03-3127-65/+61
|\ | | | | | | | | | | | | * commit '67deba8a416d818f3d95aef0aa916589090396e2': Use avpriv_report_missing_feature() where appropriate Merged-by: Clément Bœsch <cboesch@gopro.com>
| * Use avpriv_report_missing_feature() where appropriateDiego Biurrun2016-11-0833-79/+73
| |
* | Merge commit '59d2b00d201935c16408a2917957d89a170fe58f'Clément Bœsch2017-03-311-12/+19
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '59d2b00d201935c16408a2917957d89a170fe58f': configure: Add --quiet command line parameter to suppress informative output The license assignment is moved out of the quiet condition to make sure it ends up in config.h Merged-by: Clément Bœsch <cboesch@gopro.com>
| * configure: Add --quiet command line parameter to suppress informative outputDiego Biurrun2016-11-081-1/+8
| |
* | Merge commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0'Clément Bœsch2017-03-311-4/+27
|\ \ | |/ | | | | | | | | | | * commit '4537647c0429fe7c8ee655ac3fda856ba67f58a0': fate: checkasm: Split monolithic test into individual components Merged-by: Clément Bœsch <cboesch@gopro.com>
| * fate: checkasm: Split monolithic test into individual componentsDiego Biurrun2016-11-081-4/+22
| |
* | Merge commit '9498237049d15812cecb79df47b196c73013908b'Clément Bœsch2017-03-311-10/+18
|\ \ | |/ | | | | | | | | | | * commit '9498237049d15812cecb79df47b196c73013908b': checkasm: Add --test parameter to check only specific components Merged-by: Clément Bœsch <cboesch@gopro.com>
| * checkasm: Add --test parameter to check only specific componentsDiego Biurrun2016-11-081-10/+18
| | | | | | | | Inspired by a patch from Martin Storsjö <martin@martin.st>.
* | Merge commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1'Clément Bœsch2017-03-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'de6e2ff3ddf506d5b487c2f226cea73e095ad6d1': mov: Read multiple stsd from DV This commit is a noop, see a765ba647d3d5ecb7270011693cb5b171f9afd01 Merged-by: Clément Bœsch <cboesch@gopro.com>
| * mov: Read multiple stsd from DVVittorio Giovara2016-11-081-0/+2
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '47a795727f5433f5238a8a244cf181f61ea5af2c'Clément Bœsch2017-03-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '47a795727f5433f5238a8a244cf181f61ea5af2c': hevc: Support extradata changes from multiple stsd This commit is a noop, see 25fcbf7a84a485ae358f3fb3519ed4e8a98459cd Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hevc: Support extradata changes from multiple stsdVittorio Giovara2016-11-082-7/+15
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036'Clément Bœsch2017-03-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '2fe30b4743c0f4c3bdf37b91ae534cafa85e4036': hevc: Allow parsing external extradata buffers This commit is a noop as it matches FFmpeg state. Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hevc: Allow parsing external extradata buffersVittorio Giovara2016-11-081-7/+5
| |
* | Merge commit '5be21531119d7a97ebc706800d1608272ee5a507'Clément Bœsch2017-03-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '5be21531119d7a97ebc706800d1608272ee5a507': hevc: Move hevc_decode_extradata before frame decoding This commit is a noop, hevc_decode_extradata() is already above hevc_decode_frame(). Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hevc: Move hevc_decode_extradata before frame decodingVittorio Giovara2016-11-081-74/+74
| | | | | | | | | | | | Avoids a forward-declaration in the following commit. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0'Clément Bœsch2017-03-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'bed2c4b2652b1412b584e5545d6dd2ef8c613be0': lavc: Add hevc main10 profile to avconv cli This commit is a noop, see 271afd632f4de87db99ec085e75446b648dc6e60 Merged-by: Clément Bœsch <cboesch@gopro.com>
| * lavc: Add hevc main10 profile to avconv cliVittorio Giovara2016-11-082-1/+2
| |
* | Merge commit '17dac56b8fdd80c594c39b76de3f27a7949afbde'Clément Bœsch2017-03-315-5/+7
|\ \ | |/ | | | | | | | | | | * commit '17dac56b8fdd80c594c39b76de3f27a7949afbde': lavu: Rename ycgco color space appropriately Merged-by: Clément Bœsch <cboesch@gopro.com>
| * lavu: Rename ycgco color space appropriatelyVittorio Giovara2016-11-085-5/+7
| | | | | | | | | | | | Planes are ordered as the name suggests now. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1'Clément Bœsch2017-03-311-9/+11
|\ \ | |/ | | | | | | | | | | | | | | * commit '0361e4dcb4d394c88c33364415a3b8fe315b67d1': h264_qpel: x86: Move function with only one instance out of template macro Note: warning is present with clang. Merged-by: Clément Bœsch <cboesch@gopro.com>
| * h264_qpel: x86: Move function with only one instance out of template macroDiego Biurrun2016-11-081-9/+11
| | | | | | | | libavcodec/x86/h264_qpel.c:392:785: warning: unused function 'ff_avg_h264_qpel8or16_hv1_lowpass_mmxext' [-Wunused-function]
* | pthread_frame: Propagate sw_pix_fmt across threadsMark Thompson2017-03-311-0/+1
| | | | | | | | | | | | | | This is required by the VP9 hwaccels (both DXVA2 and VAAPI) when threads are enabled. Tested-by: Hendrik Leppkes <h.leppkes@gmail.com>
* | avutil/tests/dict: Check return of av_dict_parse_string()Michael Niedermayer2017-03-302-1/+11
| | | | | | | | | | | | Fixes: CID1396402 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mov: Init ref_sc / ref_st to NULLMichael Niedermayer2017-03-301-2/+2
| | | | | | | | | | | | | | | | | | This is more robust in case some change or corner case causes them to be dereferenced before being set Fixes CID1396274, CID1396275 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/libopenmpt: Check for avio_size() failureMichael Niedermayer2017-03-301-1/+1
| | | | | | | | | | | | Fixes CID1396850 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_chorus & aecho: Handle NULL return from av_strtok()Michael Niedermayer2017-03-302-2/+4
| | | | | | | | | | | | | | Fixes CID1396260 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/clearvideo: Do not lose the return code of decode_mb()Michael Niedermayer2017-03-301-2/+5
| | | | | | | | | | | | | | | | Fixes CID1401671 Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'Clément Bœsch2017-03-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301': avplay: Correct function pointer assignments in options array This commit is a noop, see a9a1bc56abf1fa79104996bf7b98b12ca42cd32c Merged-by: Clément Bœsch <u@pkh.me>
| * avplay: Correct function pointer assignments in options arrayDiego Biurrun2016-11-081-1/+1
| | | | | | | | avplay.c:2928:5: warning: ISO C forbids initialization between function pointer and ‘void *’ [-Wpedantic]
* | Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'Clément Bœsch2017-03-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '943533d64c7fa7a1b2fc9559e67652c349d21d51': avconv: Correct function pointer assignments in options array This commit is a noop, see 4c96985af1b8870482b6b6ef9120960633f62cee Merged-by: Clément Bœsch <u@pkh.me>
| * avconv: Correct function pointer assignments in options arrayDiego Biurrun2016-11-081-3/+3
| | | | | | | | | | Fixes several warnings of the type avconv_opt.c:2356:5: warning: ISO C forbids initialization between function pointer and ‘void *’ [-Wpedantic]
* | Merge commit '43de8b328b62cf21ec176c3989065168da471a5f'Clément Bœsch2017-03-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '43de8b328b62cf21ec176c3989065168da471a5f': lzf: update pointer p after realloc This commit is a noop, see bb6a7b6f75ac544c956e3eefee297700ef4d3468 Merged-by: Clément Bœsch <u@pkh.me>
| * lzf: update pointer p after reallocAndreas Cadhalpun2016-11-071-0/+2
| | | | | | | | | | | | | | This fixes heap-use-after-free detected by AddressSanitizer. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'Clément Bœsch2017-03-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c': swscale: Add GRAY12 This commit is a noop, see 19be5fb7286b02fbe384f12fe4aa5c376d43d2e1 Merged-by: Clément Bœsch <u@pkh.me>
| * swscale: Add GRAY12Luca Barbato2016-11-0710-0/+17
| |
* | Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'Clément Bœsch2017-03-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '7471352f1915813cda725ce624607d84b5a3a61c': pixfmt: Add GRAY12 This commit is a noop, see 638b216d4f54a330d0fad6cc7e1f4ec066594abe Merged-by: Clément Bœsch <u@pkh.me>
| * pixfmt: Add GRAY12Luca Barbato2016-11-074-1/+30
| |
* | Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'Mark Thompson2017-03-304-35/+252
|\ \ | |/ | | | | | | | | | | * commit '4ab61cd983b539749bd621ea271624ddb5196a8e': qsv{enc,dec}: extend the internal frame allocator Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{enc,dec}: extend the internal frame allocatorAnton Khirnov2016-11-074-35/+252
| | | | | | | | | | | | | | Handle the internal frame requests, which is required by the HEVC encoding plugin. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'Mark Thompson2017-03-304-5/+47
|\ \ | |/ | | | | | | | | | | * commit '00aeedd84105a17f414185bd33ecadebeddb3a27': qsv{dec,enc}: use a struct as a memory id with internal memory allocator Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: use a struct as a memory id with internal memory allocatorAnton Khirnov2016-11-074-5/+47
| | | | | | | | | | | | | | This will allow implementing the allocator more fully, which is needed by the HEVC encoder plugin with video memory input. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'Mark Thompson2017-03-303-33/+36
|\ \ | |/ | | | | | | | | | | | | | | * commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c': qsv{dec,enc}: always use an internal mfxFrameSurface1 Minor fixups for differences in the QSV encoder because of a53cc. Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv{dec,enc}: always use an internal mfxFrameSurface1Anton Khirnov2016-11-073-33/+36
| | | | | | | | | | | | | | | | For encoding, this avoids modifying the input surface, which we are not allowed to do. This will also be useful in the following commits. Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | Merge commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'Mark Thompson2017-03-301-0/+37
|\ \ | |/ | | | | | | | | | | * commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6': hwcontext_qsv: support frame mapping Merged-by: Mark Thompson <sw@jkqxz.net>
| * hwcontext_qsv: support frame mappingAnton Khirnov2016-11-071-0/+37
| | | | | | | | Signed-off-by: Maxym Dmytrychenko <maxym.dmytrychenko@intel.com>
* | avfilter/vf_minterpolate: Use dx and dyMichael Niedermayer2017-03-301-1/+1
| | | | | | | | | | | | Fixes CID1396283 and CID1396284 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/deshake_opencl: Remove redundant returnMichael Niedermayer2017-03-301-2/+0
| | | | | | | | | | | | Fixes: CID1396846 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_sofalizer: Fix bad shiftMichael Niedermayer2017-03-301-1/+1
| | | | | | | | | | | | Fixes CID1396835 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'Mark Thompson2017-03-301-0/+40
|\ \ | |/ | | | | | | | | | | * commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d': hwcontext_qsv: transfer data through the child context when VPP fails Merged-by: Mark Thompson <sw@jkqxz.net>
OpenPOWER on IntegriCloud