summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '54e39b102e29adcc2f59f1eca85be5f86c89454b'James Almer2017-09-28
|\ | | | | | | | | | | | | * commit '54e39b102e29adcc2f59f1eca85be5f86c89454b': configure: Explicitly spell out first require_pkg_config() parameter Merged-by: James Almer <jamrial@gmail.com>
| * configure: Explicitly spell out first require_pkg_config() parameterDiego Biurrun2017-02-20
| | | | | | | | This is less confusing than encountering "" in the argument list.
* | Merge commit '00b160af117b782292619c98effce6c8273792e5'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '00b160af117b782292619c98effce6c8273792e5': nvenc: Fix nvec vs. nvenc typo This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * nvenc: Fix nvec vs. nvenc typoDiego Biurrun2017-02-20
| |
* | Merge commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '42cf7f91f1e9dabf494ff469d8f67ac8b33b0f63': dv: Don't return EIO upon EOF This commit is a noop, see 3eae98c1ac705d3f820a1800e81960146a80c61c Merged-by: James Almer <jamrial@gmail.com>
| * dv: Don't return EIO upon EOFJohn Stebbins2017-02-19
| |
* | Merge commit '7cb9296db872c4221453e5411f242ebcfca62664'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7cb9296db872c4221453e5411f242ebcfca62664': webp: Fix alpha decoding This commit is a noop. [13:09:40] <jamrial> jkqxz: do we need 7cb9296db8 from libav? [13:11:20] <+wm4> we had vaapi vp8 for a while in ffmpeg, so I guess not [13:11:58] <@jkqxz> It's more fallout from the VP8 hwaccel which never got merged. Some people hated on that part of the patch and I wasn't really interested in pursuing it further. [13:13:02] <jamrial> it wasn't merged? [13:13:21] <@jkqxz> wm4: There is no VP8 decode hwaccel in ffmpeg (there is encode). [13:13:25] <+wm4> ah [13:14:00] <jamrial> what do i do then? and shouldn't that be merged at some point? [13:14:37] <@jkqxz> It should. [13:14:53] <@jkqxz> Skip the patch now, though. [13:16:30] <jamrial> ok, thanks Merged-by: James Almer <jamrial@gmail.com>
| * webp: Fix alpha decodingMark Thompson2017-02-18
| | | | | | | | | | | | | | | | | | This was broken by 4e528206bc4d968706401206cf54471739250ec7 - the webp decoder was assuming that it could set the output pixfmt of the vp8 decoder directly, but after that change it no longer could because ff_get_format() was used instead. This adds an internal get_format() callback to webp use of the vp8 decoder to override the pixfmt appropriately.
* | movenc-test: Add tests for negative cts offsetsMartin Storsjö2017-09-28
| | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movenc: Add an option for enabling negative CTS offsetsMartin Storsjö2017-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the need for an edit list; streams that start with e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid in mov/mp4) by shifting the dts values of all packets forward. This avoids the need for edit lists for such streams (while they still are needed for audio streams with encoder delay). This eases conformance with the DASH-IF interoperability guidelines. Signed-off-by: Martin Storsjö <martin@martin.st> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '2d518aec4c781316092be65893b47922c8f71b67'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '2d518aec4c781316092be65893b47922c8f71b67': vf_deinterlace_vaapi: Create filter buffer after context vaapi_encode: Discard output buffer if picture submission fails This commit is a noop, see 92bd08974541611731b2d58723826ea26ecbe47d 359586f14f46bf3f9c1ae3375d80e8c0fc377bef Merged-by: James Almer <jamrial@gmail.com>
| * vf_deinterlace_vaapi: Create filter buffer after contextMark Thompson2017-02-17
| | | | | | | | | | | | The Intel proprietary VAAPI driver enforces the restriction that a buffer must be created inside an existing context, so just ensure this is always true.
| * vaapi_encode: Discard output buffer if picture submission failsMark Thompson2017-02-16
| | | | | | | | | | Previously this was leaking, though it actually hit an assert making sure that the buffer had already been cleared when freeing the picture.
* | Merge commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f5de34c8fb18fa1416e77d2cb998773a49ddb3d': vf_fade: Make sure to not miss the last lines of a frame This commit is a noop. [11:00:43] <jamrial> michaelni: what do you think of 8f5de34c8f? does it apply to us? [11:01:50] <jamrial> our code started to deviate with your commit bca59d7745e, followed by the merge commit aa40df483b2 [11:33:51] <michaelni> jamrial, the fade commits are from 2013, but i think our fixes where complete and the problematic slice_h FFALIGN is also removed Merged-by: James Almer <jamrial@gmail.com>
| * vf_fade: Make sure to not miss the last lines of a frameMartin Storsjö2017-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When slice_h is rounded up due to chroma subsampling, there's a risk that jobnr * slice_h exceeds frame->height. Prior to a638e9184d63, this wasn't an issue for the last slice of a frame, since slice_end was set to frame->height for the last slice. a638e9184d63 tried to fix the case where other slices than the last one would exceed frame->height (which can happen where the number of slices/threads is very large compared to the frame height). However, the fix in a638e9184d63 instead broke other cases, where slice_h * nb_threads < frame->height. Therefore, make sure the last slice always ends at frame->height. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6'James Almer2017-09-28
|\| | | | | | | | | | | | | * commit 'd00a0d8e84fef1b9124bfaf71cc17df79ca464a6': configure: Handle SDL version check through pkg-config Merged-by: James Almer <jamrial@gmail.com>
| * configure: Handle SDL version check through pkg-configDiego Biurrun2017-02-16
| |
* | Merge commit '8847eeaa141898850381400000fb2b8a7adc7100'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '8847eeaa141898850381400000fb2b8a7adc7100': aarch64: Add parentheses around the offset parameter in movrel This commit is a noop, see dda45c087b2c09ba9e485c51ff9c8f2aaca709a9 Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: Add parentheses around the offset parameter in movrelMartin Storsjö2017-02-16
| | | | | | | | | | | | This fixes building with clang for linux with PIC enabled. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '82989bd98c7f4e87f59af2147b645b8fd8f31c53': avconv: Move rescale to stream timebase before monotonisation This commit is a noop, see 4ee5aed122ba7d289c1686eca6eba161d5d62304 Merged-by: James Almer <jamrial@gmail.com>
| * avconv: Move rescale to stream timebase before monotonisationMark Thompson2017-02-15
| | | | | | | | | | | | If the stream timebase is coarser than the muxing timebase then the monotonisation process may fail because adding one to the timestamp need not actually produce a different timestamp after the rescale.
* | avcodec/libopenh264dec: check for ff_set_dimensions() return valueJames Almer2017-09-28
| | | | | | | | | | | | Was removed by accident in e9b6212de29a966f200833220ed35f51852f05f6. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '030de53e9cc225dc767458aedcc87efd457b4f3b'James Almer2017-09-28
|\| | | | | | | | | | | | | * commit '030de53e9cc225dc767458aedcc87efd457b4f3b': libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filter Merged-by: James Almer <jamrial@gmail.com>
| * libopenh264dec: Let the framework use the h264_mp4toannexb bitstream filterMartin Storsjö2017-02-15
| | | | | | | | | | | | This avoids a lot of boilerplate code within the decoder wrapper itself. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '0539d84d985e811e5989ef27c13f7e2dda0f9b89': asfdec: Account for different Format Data sizes See 76853a3e0ce4d4ef09ffcca7307991b8db832cd4 Merged-by: James Almer <jamrial@gmail.com>
| * asfdec: Account for different Format Data sizesAlexandra Hájková2017-02-15
| | | | | | | | | | | | | | | | | | | | Some muxers may use the BMP_HEADER Format Data size instead of the ASF-specific one. Bug-Id: 1020 CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '871b4f3654636ed64560e86b9faa33828d195ceb'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '871b4f3654636ed64560e86b9faa33828d195ceb': configure: Check for xcb as well as xcb-shape before enabling libxcb This commit is a noop. We already check for libxcb_shape. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Check for xcb as well as xcb-shape before enabling libxcbDiego Biurrun2017-02-15
| | | | | | | | | | Newer versions of libxcb have xcb-foo pkg-config files that do not declare their xcb dependency so that required linker flags will not be generated.
* | Merge commit 'b446f0e98f85e2e931b476e52b319f1c49244660'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit 'b446f0e98f85e2e931b476e52b319f1c49244660': mov: Do not try to parse multiple stsd for the same track See 8b43ee4054af799e388d380b379a13a60849c1b5 Merged-by: James Almer <jamrial@gmail.com>
| * mov: Do not try to parse multiple stsd for the same trackLuca Barbato2017-02-15
| | | | | | | | | | | | | | Bug-Id: 1017 CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e791b915c774408fbc0ec9e7270b021899e08ccc'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit 'e791b915c774408fbc0ec9e7270b021899e08ccc': hwcontext_vaapi: Try to support the VDPAU wrapper This commit is a noop, see f2e4fb61af4b47c329fbf2b9a245594957d7bbab Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_vaapi: Try to support the VDPAU wrapperMark Thompson2017-02-13
| | | | | | | | | | | | | | | | The driver is somewhat bitrotten (not updated for years) but is still usable for decoding with this change. To support it, this adds a new driver quirk to indicate no support at all for surface attributes. Based on a patch by wm4 <nfxjfg@googlemail.com>.
* | Merge commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '5dd9a4b88b287bf8c93520afda7becb1ad0d1894': vaapi: Implement device-only setup This commit is a noop, see 81b7deab8296f8446a64e20b9fcaf8eba88b9e29 Merged-by: James Almer <jamrial@gmail.com>
| * vaapi: Implement device-only setupMark Thompson2017-02-13
| | | | | | | | | | In this case, the user only supplies a device and the frame context is allocated internally by lavc.
* | Merge commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | * commit '44f2eda39ff55c69d4d739fb12a42a10b7ce581c': lavc: Add device context field to AVCodecContext This commit is a noop, see c1a5fca06f75cc0e7b9b2808fecaa0c1b424da50 Merged-by: James Almer <jamrial@gmail.com>
| * lavc: Add device context field to AVCodecContextMark Thompson2017-02-13
| | | | | | | | For use by codec implementations which can allocate frames internally.
* | Merge commit '07b5136c481d394992c7e951967df0cfbb346c0b'James Almer2017-09-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '07b5136c481d394992c7e951967df0cfbb346c0b': aarch64: vp9lpf: Fix broken indentation/vertical alignment aarch64: vp9lpf: Interleave the start of flat8in into the calculation above arm: vp9lpf: Interleave the start of flat8in into the calculation above This commit is a noop, see 83399cf569c9f78e0c72e21aa67184c222bb2d59 9f3a8863648ed19ea69ca5ddfcfa3c80e0df15b0 c8d6eec85d6a87c9075c87d5eb75af47c964fff8 Merged-by: James Almer <jamrial@gmail.com>
| * aarch64: vp9lpf: Fix broken indentation/vertical alignmentMartin Storsjö2017-02-12
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * aarch64: vp9lpf: Interleave the start of flat8in into the calculation aboveMartin Storsjö2017-02-11
| | | | | | | | | | | | | | This adds lots of extra .ifs, but speeds it up by a couple cycles, by avoiding stalls. Signed-off-by: Martin Storsjö <martin@martin.st>
| * arm: vp9lpf: Interleave the start of flat8in into the calculation aboveMartin Storsjö2017-02-11
| | | | | | | | | | | | | | This adds lots of extra .ifs, but speeds it up by a couple cycles, by avoiding stalls. Signed-off-by: Martin Storsjö <martin@martin.st>
* | doc/libav-merge: mention skipped or incomplete runtime alignment commitsJames Almer2017-09-27
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | | | * commit '9c2d36fcaf8748b9baa9aba9264abefce711d67b': dv: Convert to the new bitstream reader This commit is a noop, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html Merged-by: James Almer <jamrial@gmail.com>
| * dv: Convert to the new bitstream readerLuca Barbato2017-02-11
| |
* | Merge commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'ba30b74686f0cb6c9dd465ac4820059c48bf9d08': aac: Validate the sbr sample rate before using the value See cf5f4c5169639349262aa221ae485a0de188afb1 Merged-by: James Almer <jamrial@gmail.com>
| * aac: Validate the sbr sample rate before using the valueLuca Barbato2017-02-11
| | | | | | | | | | | | | | Avoid a floating point exception. Bug-Id: 1027 CC: libav-stable@libav.org
* | Merge commit '0ee78020cd41d81eec651acd7fc65906207796f3'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '0ee78020cd41d81eec651acd7fc65906207796f3': configure: Move up the avbuild directory creation This commit is a noop, see 19bf50406ebf8bff1be7388da2ed7a85738d055f Merged-by: James Almer <jamrial@gmail.com>
| * configure: Move up the avbuild directory creationLuca Barbato2017-02-11
| | | | | | | | | | | | | | The early check for inconsistent in-source vs out-of-source build cannot generate a config.log otherwise. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c2f97f050870897575570708ac48c5c15e6a0dd8'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit 'c2f97f050870897575570708ac48c5c15e6a0dd8': hwcontext_dxva2: support D3D9Ex This commit is a noop, see 50708f4aa40ce96122cf93d9e36cca8024baf025 Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_dxva2: support D3D9Exwm42017-02-11
| | | | | | | | | | | | | | | | D3D9Ex uses different driver paths. This helps with "headless" configurations when no user logs in. Plain D3D9 device creation will fail if no user is logged in, while it works with D3D9Ex. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '04f3bd349651694f30feeb8c4ed9bc58106fca54'James Almer2017-09-27
|\| | | | | | | | | | | | | | | | | * commit '04f3bd349651694f30feeb8c4ed9bc58106fca54': AVFrame: add an opaque_ref field This commit is a noop, see e3af49b14bf371e18fab1c12cba0239e6658672c Merged-by: James Almer <jamrial@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-30 21:34:55 +0000