summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'James Almer2017-10-2111-127/+43
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5': Bump major versions of all libraries A few API deprecated ~2 years ago or more are also postponed here for varying reasons. FF_API_LOWRES: Since this functionality depends on AVStream->codec, i figure the two can be removed at the same time in the next bump or so. FF_API_AVCTX_TIMEBASE: Couldn't get this one to work. Not just libavcodec but apparently also libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for decoding. Upon removal some tests report a different generic stream time base (like 1/25), and others lose packet duration values. I guess it's somehow tied to the AVStream->codec clusterfuck. It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump. FF_API_OLD_FILTER_OPTS_ERROR: This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed. Its purpose is displaying the corrected command line using the new syntax as a suggestion as part of the error message. Merged-by: James Almer <jamrial@gmail.com>
| * Bump major versions of all librariesVittorio Giovara2017-03-237-29/+29
| | | | | | | | | | | | | | | | | | This disables everything that was deprecated at least 18 months ago. Readjust the minimum API version as needed, postponing any API-incompatible changes until the next bump. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '628ce8b8b6b80cb3985d39e195b71b9d7fad9008': flvdec: Set avg_frame_rate for video streams This commit is a noop, see e0791c5aaf1c12601322e410119ca46c6d09981d Merged-by: James Almer <jamrial@gmail.com>
| * flvdec: Set avg_frame_rate for video streamsCarl Eugen Hoyos2017-03-221-0/+9
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '8e2346154e6d58b733fd20326ce706f82fd91b3e'James Almer2017-10-211-6/+6
|\ \ | |/ | | | | | | | | | | * commit '8e2346154e6d58b733fd20326ce706f82fd91b3e': libavutil: Hook up the rest of the gcc specific attributes to clang as well Merged-by: James Almer <jamrial@gmail.com>
| * libavutil: Hook up the rest of the gcc specific attributes to clang as wellMartin Storsjö2017-03-221-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hook up all attributes that don't have a MSVC specific version at the moment. See f637046d313 for details. These don't seem to be critical for building with clang in MSVC mode though, and thus haven't been hooked up until now. These seem to build fine with as old clang as 3.3 at least. (clang 3.3 disguises itself as gcc 4.2 normally, so all of these have been used for clang before, except for av_cold.) The clang version numbers themselves are useless for detecting what attributes are available, since Apple's clang builds use a completely different versioning (presenting itself as e.g. clang 8.0 instead of 3.8). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '3aa9c523e9cf4f4a5e239ac737281e096c884907'James Almer2017-10-211-1/+1
|\ \ | |/ | | | | | | | | | | * commit '3aa9c523e9cf4f4a5e239ac737281e096c884907': libavutil: Define the noreturn attribute for clang in MSVC mode as well Merged-by: James Almer <jamrial@gmail.com>
| * libavutil: Define the noreturn attribute for clang in MSVC mode as wellMartin Storsjö2017-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | This is a follow-up to f637046d313. Without the noreturn attribute set, avconv_opt.c fails to build after d2e6dd32a44 with the error "control may reach end of non-void function". By making sure the noreturn attribute is set properly, this compiles as intended. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a46a4f722d2fac07c57990f0f548777622599f59'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a46a4f722d2fac07c57990f0f548777622599f59': dca: Refactor dca_filter_channels() a little dca: Validate the channel map This commit is a noop, we have a different DCA decoder. Merged-by: James Almer <jamrial@gmail.com>
| * dca: Refactor dca_filter_channels() a littleLuca Barbato2017-03-211-4/+6
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dca: Validate the channel mapLuca Barbato2017-03-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | Having a mismatch between the number of channels in the stream and those in the channel map will lead to a segfault or worse. Bug-Id: 1016 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '3df77b58e35a30ed550f99936a308f6bd2f47a20'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '3df77b58e35a30ed550f99936a308f6bd2f47a20': nvenc: Allow different const qps for I, P and B frames This commit is a noop, see 2db5ab73d43a8c22616e686ab12f94223910c761 Merged-by: James Almer <jamrial@gmail.com>
| * nvenc: Allow different const qps for I, P and B framesKonda Raju2017-03-211-9/+19
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ca960161f087ca38267b88ce90592010c59584f1'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'ca960161f087ca38267b88ce90592010c59584f1': rtsp: Move message parsing to a separate function This commit is a noop, see 1e27837265702b63db65122e97178a0ca4d25e05 Merged-by: James Almer <jamrial@gmail.com>
| * rtsp: Move message parsing to a separate functionLuca Barbato2017-03-211-25/+32
| | | | | | | | | | Make easier to handle the polling function before we implement full threading support.
* | Merge commit 'bd805964f40f7af83da64645ba83d1e8060a1214'James Almer2017-10-211-5/+7
|\ \ | |/ | | | | | | | | | | * commit 'bd805964f40f7af83da64645ba83d1e8060a1214': configure: Do not treat JACK as a system library Merged-by: James Almer <jamrial@gmail.com>
| * configure: Do not treat JACK as a system libraryLuca Barbato2017-03-211-3/+7
| | | | | | | | | | JACK is not commonly installed and should not be picked up as a dependency unless specifically requested.
* | Merge commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '303fadf5963e01b8edf4ba2701e45f7e9e586aeb': avconv: Document the -init_hw_device option avconv: Enable generic hwaccel support for VDPAU lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx API lavc: Add hwaccel_flags field to AVCodecContext avconv: Enable generic hwaccel support for VAAPI avconv: Generic device setup hwcontext: Make it easier to work with device types hwcontext: Add device derivation This commit is a noop, see b22172f6f3530b8bd9d1d2c38a31b1e9c3729e42 0b1794a43e1083644aa3db2a09323681cfe080ec 06043cc0bc72b530db352a67776392cf61a54104 be510733523016aae7dca74bba6aa3b223c1fed6 156bd8278f4098426cffaa68efb161907e5c1869 7e4ba776a2240d40124d5540ea6b2118fa2fe26a e462ace84b92e54d2a5fa651d6469aefe0f1efbf 527a1e213167123d24d014bc0b956ef43d9d6542 Merged-by: James Almer <jamrial@gmail.com>
| * avconv: Document the -init_hw_device optionMark Thompson2017-03-201-27/+58
| |
| * avconv: Enable generic hwaccel support for VDPAUMark Thompson2017-03-204-163/+2
| |
| * lavc: vdpau: add support for new hw_frames_ctx and hw_device_ctx APIwm42017-03-203-20/+69
| | | | | | | | | | | | | | | | | | This supports retrieving the device from a provided hw_frames_ctx, and automatically creating a hw_frames_ctx if hw_device_ctx is set. The old API is not deprecated yet. The user can still use av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use the API before that by allocating and setting hwaccel_context manually.
| * lavc: Add hwaccel_flags field to AVCodecContextwm42017-03-204-1/+16
| | | | | | | | | | | | | | | | This "reuses" the flags introduced for the av_vdpau_bind_context() API function, and makes them available to all hwaccels. This does not affect the current vdpau API, as av_vdpau_bind_context() should obviously override the AVCodecContext.hwaccel_flags flags for the sake of compatibility.
| * avconv: Enable generic hwaccel support for VAAPIMark Thompson2017-03-204-238/+16
| |
| * avconv: Generic device setupMark Thompson2017-03-205-6/+452
| | | | | | | | Not yet enabled for any hwaccels.
| * hwcontext: Make it easier to work with device typesMark Thompson2017-03-204-1/+74
| | | | | | | | | | | | Adds functions to convert to/from strings and a function to iterate over all supported device types. Also adds a new invalid type AV_HWDEVICE_TYPE_NONE, which acts as a sentinel value.
| * hwcontext: Add device derivationMark Thompson2017-03-205-1/+103
| | | | | | | | | | Creates a new device context from another of a different type which refers to the same underlying hardware.
* | Merge commit 'b864230c49089b087eef56988a3d6a784f6f9827'James Almer2017-10-213-43/+74
|\ \ | |/ | | | | | | | | | | * commit 'b864230c49089b087eef56988a3d6a784f6f9827': rtmp: Move RTMP digest calculation to a separate file Merged-by: James Almer <jamrial@gmail.com>
| * rtmp: Move RTMP digest calculation to a separate fileDiego Biurrun2017-03-203-43/+74
| | | | | | | | The rtmpcrypt protocol requires it.
* | Merge commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'cfee5e1a0fa892fadd19b8848545d62f2386a6e7': build: Add missing object dependency for extract_extradata bitstream filter This commit is a noop, see f8e29a371622316c68db7017ab04dd447b0114ba Merged-by: James Almer <jamrial@gmail.com>
| * build: Add missing object dependency for extract_extradata bitstream filterDiego Biurrun2017-03-201-1/+2
| |
* | Merge commit '7995ebfad12002033c73feed422a1cfc62081e8f'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '7995ebfad12002033c73feed422a1cfc62081e8f': arm/aarch64: vp9: Fix vertical alignment This commit is a noop, see 21c89f3a26bb1331381b90e653277585447cfbb3 Merged-by: James Almer <jamrial@gmail.com>
| * arm/aarch64: vp9: Fix vertical alignmentMartin Storsjö2017-03-163-26/+26
| | | | | | | | | | | | | | | | | | | | Align the second/third operands as they usually are. Due to the wildly varying sizes of the written out operands in aarch64 assembly, the column alignment is usually not as clear as in arm assembly. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'James Almer2017-10-211-62/+63
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574': matroskaenc: add support for Spherical Video elements See 58eb0f57f6702d57b6f97ec5010657bb2c076eff. Merged for cosmetics purposes. Also includes changes from d32d59bc977b43031007bb2ab21e232f96d2ebcb Merged-by: James Almer <jamrial@gmail.com>
| * matroskaenc: add support for Spherical Video elementsJames Almer2017-03-152-1/+85
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Minor cosmetic changes by committer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5'James Almer2017-10-211-1/+1
|\ \ | |/ | | | | | | | | | | * commit '0d8013b88b1cb7d65da891a8819d3beebafb9bb5': configure: Replace -no_weak_symbols with -Werror=partial-availability Merged-by: James Almer <jamrial@gmail.com>
| * configure: Replace -no_weak_symbols with -Werror=partial-availabilityLuca Barbato2017-03-151-1/+1
| | | | | | | | Jack uses weak symbols on purpose.
* | Merge commit '681a86aba6cb09b98ad716d986182060c7795d20'James Almer2017-10-211-51/+43
|\ \ | |/ | | | | | | | | | | * commit '681a86aba6cb09b98ad716d986182060c7795d20': x86: fft: Port to cpuflags Merged-by: James Almer <jamrial@gmail.com>
| * x86: fft: Port to cpuflagsDiego Biurrun2017-03-141-51/+43
| |
* | Merge commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb'James Almer2017-10-211-24/+28
|\ \ | |/ | | | | | | | | | | * commit 'e9bb77fb1012cba1951a82136df7071f71bce8fb': x86: h264: Simplify DEQUANT macro with cpuflags Merged-by: James Almer <jamrial@gmail.com>
| * x86: h264: Simplify DEQUANT macro with cpuflagsDiego Biurrun2017-03-141-24/+28
| |
* | Merge commit '307eb1a8ee363db1fcf869e427a8deb6d9538881'James Almer2017-10-211-77/+66
|\ \ | |/ | | | | | | | | | | * commit '307eb1a8ee363db1fcf869e427a8deb6d9538881': x86: vp8dsp: port FILTER_BILINEAR macro to cpuflags Merged-by: James Almer <jamrial@gmail.com>
| * x86: vp8dsp: port FILTER_BILINEAR macro to cpuflagsDiego Biurrun2017-03-141-77/+66
| |
* | Merge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2'James Almer2017-10-214-53/+28
|\ \ | |/ | | | | | | | | | | | | | | * commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2': x86util: Port all macros to cpuflags See d5f8a642f6eb1c6e305c41dabddd0fd36ffb3f77 Merged-by: James Almer <jamrial@gmail.com>
| * x86util: Port all macros to cpuflagsDiego Biurrun2017-03-143-34/+33
| | | | | | | | | | | | Also do some small cosmetic changes: Drop pointless _MMX suffix from ABSD2 macro name, drop pointless check for MMX support, we always assume MMX is available in our SIMD code, fix spelling.
* | Merge commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a'James Almer2017-10-210-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '522d850e68ec4b77d3477b3c8f55b1ba00a9d69a': h264_cavlc: check the value of run_before [10:00:09] <jamrial> michaelni: what do you think of libav commit 522d850e68? [10:00:45] <jamrial> it applies, but i can't reproduce the invalid reads with the sample from the ticket mentioned in it [10:52:57] <michaelni> jamrial, if theres an issue it should be fixed by enlarging the scantable (as its faster) or maybe you can even drop the if/else and use vlcs that are never returning a out of range value. Id say the FFMIN is wrong in all cases, it should be a error return if a check is added not silently continuing [11:22:11] <michaelni> jamrial, i think the mb_padding stuff we have makes it unneeded but we can possibly improve it beyond what we have This commit is a noop Merged-by: James Almer <jamrial@gmail.com>
| * h264_cavlc: check the value of run_beforeAnton Khirnov2017-03-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | Section 9.2.3.2 of the spec implies that run_before must not be larger than zeros_left. Fixes invalid reads with corrupted files. CC: libav-stable@libav.org Bug-Id: 1000 Found-By: Kamil Frankowicz
* | avformat/mov: Set start_pad correctly in mov_fix_index()Dale Curtis2017-10-213-1/+16
| | | | | | | | | | | | | | | | | | | | | | Sets the correct start padding value when an edit list is present. A new fate test is added, fate-mov-440hz-10ms, to ensure this is handled correctly. Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Reviewed-by: Sasi Inguva <isasi-at-google.com@ffmpeg.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavc: drop support for OpenJPEG 1.3-2.0Michael Bradshaw2017-10-204-243/+35
| | | | | | | | | | | | We now require 2.1+ with pkg-config. Signed-off-by: Michael Bradshaw <mjbshaw@google.com>
* | Merge commit '83b2b34d06e74cc8775ba3d833f9782505e17539'James Almer2017-10-201-36/+49
|\ \ | |/ | | | | | | | | | | * commit '83b2b34d06e74cc8775ba3d833f9782505e17539': h2645_parse: use the bytestream2 API for packet splitting Merged-by: James Almer <jamrial@gmail.com>
| * h2645_parse: use the bytestream2 API for packet splittingAnton Khirnov2017-03-121-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | The code does some nontrivial jumping around in the buffer, so it is safer to use a checked API rather than do everything manually. Fixes a bug in nalff parsing, where the length field is currently not counted in the buffer size check, resulting in possible overreads with invalid files. CC: libav-stable@libav.org Bug-Id: 1002 Found-By: Kamil Frankowicz
View Lorry Controller Status