summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '46191a2da16f751e53d93646ae1388d421d12bee'Clément Bœsch2017-04-29
|\| | | | | | | | | | | | | * commit '46191a2da16f751e53d93646ae1388d421d12bee': mov: fix a possible invalid read in mov_read_mac_string() Merged-by: Clément Bœsch <u@pkh.me>
| * mov: fix a possible invalid read in mov_read_mac_string()Anton Khirnov2016-12-19
| | | | | | | | | | | | | | | | | | | | When the input string is too large, so the second condition in if () fails, the code will erroneously execute the else branch, indexing the mac_to_unicode table with a negative index. CC: libav-stable@libav.org Bug-Id: 1000 Found-By: Kamil Frankowicz
* | Merge commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9'Clément Bœsch2017-04-29
|\| | | | | | | | | | | | | | | | | * commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9': vaapi_decode: use the correct logging context This commit is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_decode: use the correct logging contextAnton Khirnov2016-12-19
| |
* | Merge commit 'ea8b730d8e67152107d7fcdd5590bbb51ec236b1'Clément Bœsch2017-04-29
|\| | | | | | | | | | | | | | | | | * commit 'ea8b730d8e67152107d7fcdd5590bbb51ec236b1': hevcdec: add a VAAPI hwaccel This commit is a noop, see adb54e59c18db347f39e55832104fc3e40a3c42b Merged-by: Clément Bœsch <u@pkh.me>
| * hevcdec: add a VAAPI hwaccelAnton Khirnov2016-12-19
| | | | | | | | | | Partially based on a patch by Timo Rothenpieler <timo@rothenpieler.org>. Additional scaling list handling fix by Jun Zhao <mypopydev@gmail.com>.
* | Merge commit '1783d7ec03d730c5bd96c07bc5fa7aa566f85c66'Clément Bœsch2017-04-29
|\| | | | | | | | | | | | | * commit '1783d7ec03d730c5bd96c07bc5fa7aa566f85c66': Changelog: add some missing entries Merged-by: Clément Bœsch <u@pkh.me>
| * Changelog: add some missing entriesAnton Khirnov2016-12-19
| |
* | doc/filters: add one lowpass filter examplePaul B Mahol2017-04-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/movenc: Explicitly address potential division by zero.Lucas Cooper2017-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | find_fps attempts to infer framerate from AVCodec's timebase. When this results in a frame rate that isn't explicitly marked as supported in av_timecode_check_frame_rate, find_fps returns the AVStream's avg_frame_rate, which, per avformat.h, _may_ be set (or not). mov_get_mpeg2_xdcam_codec_tag, mov_get_h264_codec_tag and find_compressor attempt to call av_q2d on the return value of find_fps, which in the above case, may result in division by zero and therefore, an undefined frame rate when NaN is converted to int. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libvpxenc: allow aq-mode 4 (equator360)James Zern2017-04-28
| | | | | | | | | | | | | | this was added in 1.6.0 Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com> Signed-off-by: James Zern <jzern@google.com>
* | avfilter/lavfutils: use image2pipe demuxer on ff_load_imageMuhammad Faiz2017-04-29
| | | | | | | | | | | | | | allow protocols other than file to be used for example, use data protocol to embed a file in script Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | avformat/hlsenc: fix CID 1405135Steven Liu2017-04-28
| | | | | | | | | | | | | | Fixes Coverity CID: 1405135 Reviewed-by: Rodger Combs <rodger.combs@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avformat/hlsenc: hold old key info when append listSteven Liu2017-04-28
| | | | | | | | | | | | fix ticket id: #6353 Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | opus_pvq: use function pointers for recursionRostislav Pehlivanov2017-04-27
| | | | | | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | avcodec/opus_pvq: fix recursive inlining compilation failuresJames Almer2017-04-27
| | | | | | | | They were introduced by f16180f44859587e0211170bd82b1bfd26f24b5a
* | avcodec/mdec: Fix runtime error: left shift of negative value -127Michael Niedermayer2017-04-27
| | | | | | | | | | | | | | | | Fixes undefined behavior Fixes: 1275/clusterfuzz-testcase-minimized-6718162017976320 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tools/target_dec_fuzzer: Fix return code on open failureMichael Niedermayer2017-04-27
| | | | | | | | | | | | | | Fixes: 1271/clusterfuzz-testcase-minimized-6095220498235392 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and ↵Michael Niedermayer2017-04-27
| | | | | | | | | | | | | | | | | | clang compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions Build succeeds with this change, this was the only failure Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavcodec/exr : fix float to uint16 conversion for negative float valueMartin Vignali2017-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | opus_pvq: merge band encoding and decoding into one functionRostislav Pehlivanov2017-04-27
| | | | | | | | | | | | | | | | | | | | | | Most code between the 2 functions was duplicated which made keeping both in sync difficult. This also fixes some discovered issues with encoding (incorrect TF switching buffers) and reduces stack usage (reuse the already allocated CeltFrame->scratch buffer for the quantized coefficients). Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | opus_pvq: remove outdated/incorrect comments and redundant variablesRostislav Pehlivanov2017-04-26
| | | | | | | | | | | | Removes the last style issues with opus_pvq.c Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | opus_pvq: minor cleanupsRostislav Pehlivanov2017-04-26
| | | | | | | | | | | | | | | | Removes unneeded variables, renames confusing and innacurate variables and rewrites and slightly optimizes hadamard interleave/deinterleave functions. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | avcodec/nvenc: surface allocation reductionBen Chang2017-04-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch aims to reduce the number of input/output surfaces NVENC allocates per session. Previous default sets allocated surfaces to 32 (unless there is user specified param or lookahead involved). Having large number of surfaces consumes extra video memory (esp for higher resolution encoding). The patch changes the surfaces calculation for default, B-frames, lookahead scenario respectively. The other change involves surface selection. Previously, if a session allocates x surfaces, only x-1 surfaces are used (due to combination of output delay and lock toggle logic). To prevent unused surfaces, changing surface rotation to using predefined fifo. Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* | lavc/hevcdec: fix invalid use of ff_get_format()Clément Bœsch2017-04-26
| | | | | | | | | | | | Regression since 76cc100afba25308eaa909acd8804cc0b42057f6. Spotted-by: James Almer <jamrial@gmail.com>
* | Merge commit 'd4a91e65343be5d79a4afa61c791191e1b57499a'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit 'd4a91e65343be5d79a4afa61c791191e1b57499a': pthread_frame: do not run hwaccel decoding asynchronously unless it's safe This commit is a noop, see e0cd598bc4684654d63942e9ff4872c0b48a7dc2 Merged-by: Clément Bœsch <u@pkh.me>
| * pthread_frame: do not run hwaccel decoding asynchronously unless it's safeAnton Khirnov2016-12-19
| | | | | | | | | | | | | | | | | | | | 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).
* | Merge commit '8dfba25ce89b62c80ba83e2116d549176c376144'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit '8dfba25ce89b62c80ba83e2116d549176c376144': pthread_frame: ensure the threads don't run simultaneously with hwaccel This commit is a noop, see 14bb15bfd56d6e907fabe4620206c1ee152b7a20 Merged-by: Clément Bœsch <u@pkh.me>
| * pthread_frame: ensure the threads don't run simultaneously with hwaccelAnton Khirnov2016-12-19
| |
* | Merge commit '373fd76b4dbd9aa03ed28e502f33f2ca8c1ce19a'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '373fd76b4dbd9aa03ed28e502f33f2ca8c1ce19a': hevcdec: do not set decoder-global SPS prematurely Merged-by: Clément Bœsch <u@pkh.me>
| * hevcdec: do not set decoder-global SPS prematurelyAnton Khirnov2016-12-19
| | | | | | | | | | | | | | | | It should only be set after the decoder state has been fully initialized for using that SPS. Fixes possible invalid reads on get_format() failure. CC: libav-stable@libav.org
* | Merge commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '0fea8555ae25124c21f4c4f55a5fa76e9169aa03': v4l2: use codec descriptors for mapping a codec name to id Merged-by: Clément Bœsch <u@pkh.me>
| * v4l2: use codec descriptors for mapping a codec name to idAnton Khirnov2016-12-19
| | | | | | | | | | This mapping has nothing to do with decoder implementations, so using decoder names is wrong.
* | Merge commit 'ee480790c7eeb03c9cebd8971c46e0cb7db65277'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit 'ee480790c7eeb03c9cebd8971c46e0cb7db65277': build: Add name parameter to check_lib() helper function Merged-by: Clément Bœsch <u@pkh.me>
| * build: Add name parameter to check_lib() helper functionDiego Biurrun2016-12-16
| | | | | | | | | | This allows enabling or disabling the library-related variables from within the function instead of doing it manually outside of it.
* | Merge commit '1faffe7e8fab21186a233011bc8a62f47962e2cd'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '1faffe7e8fab21186a233011bc8a62f47962e2cd': configure: Disentangle vfw32 and user32 lib handling Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Disentangle vfw32 and user32 lib handlingDiego Biurrun2016-12-16
| | | | | | | | | | Check for and link against user32 instead, which also fixes the missing dependency of dxva2 on user32 with MSVC.
* | Merge commit 'f7174d7ed045445d00a6d557236737d09ad32343'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit 'f7174d7ed045445d00a6d557236737d09ad32343': configure: fix linking with MSVC when using --disable-optimizations Merged-by: Clément Bœsch <u@pkh.me>
| * configure: fix linking with MSVC when using --disable-optimizationsSteve Lhomme2016-12-16
| | | | | | | | | | | | | | | | | | Without any optimization flags, MSVC does no dead code elimination (DCE) at all, even for the most trivial cases. DCE is a prerequisite for building libav correctly, otherwise there are undefined references to functions for other architectures and disabled components. -O1 is the minimal optimization flag for MSVC that does include DCE.
* | Merge commit 'ef9a711be718ed3802a263d1d9ed340a4aaef224'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit 'ef9a711be718ed3802a263d1d9ed340a4aaef224': configure: put d3d11 check in alphabetical order Merged-by: Clément Bœsch <u@pkh.me>
| * configure: put d3d11 check in alphabetical orderSteve Lhomme2016-12-16
| |
* | Merge commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit 'a4fec9a7eab842ea5eea1b1ee98624356cb31422': rtmppkt: Check for packet size mismatches See 7d57ca4d9a75562fa32e40766211de150f8b3ee7 Merged-by: Clément Bœsch <u@pkh.me>
| * rtmppkt: Check for packet size mismatchesMichael Niedermayer2016-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When receiving fragmented packets, the first packet declares the size, and the later ones normally are small follow-on packets that don't repeat the size and the other header fields. But technically, the later fragments also can have a full header, declaring a different size than the previous packet. If the follow-on packet declares a larger size than the initial one, we could end up writing outside of the allocation. This fixes out of bounds writes. Found-by: Paul Cher <paulcher@icloud.com> Reviewed-by: Paul Cher <paulcher@icloud.com> CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit 'cdcfa97dc49d83b5eefd0a651db6bb0a6f98e8f2': libavformat: Fix a faulty api deprecation guard in prepare_input_packet Merged-by: Clément Bœsch <u@pkh.me>
| * libavformat: Fix a faulty api deprecation guard in prepare_input_packetMartin Storsjö2016-12-15
| | | | | | | | | | | | | | | | | | | | | | This seems to have been added by mistake in 11de006b, by not noticing the negation for the existing condition. This block does not contain any code that accesses the codec field in AVStream. This function is meant to serve as a complement to compute_pkt_fields2, which is guarded by FF_API_COMPUTE_PKT_FIELDS2 && FF_API_LAVF_AVCTX. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2425d7329fdccfa9954faba748f3865151354f0c'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '2425d7329fdccfa9954faba748f3865151354f0c': arm64: replace 'bic' with immediate with 'and' with inverted immediate Merged-by: Clément Bœsch <u@pkh.me>
| * arm64: replace 'bic' with immediate with 'and' with inverted immediateJanne Grunau2016-12-14
| | | | | | | | | | | | The former is not an official pseudo instruction although gas and llvm's internal assembler support it. Fixes a build error with xcode 6.2 reported by Memphiz on github.
* | Merge commit '05a603a94e4b3eeefa5e18ae653a848001461e89'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '05a603a94e4b3eeefa5e18ae653a848001461e89': ppc: Merge types_altivec.h into util_altivec.h Merged-by: Clément Bœsch <u@pkh.me>
| * ppc: Merge types_altivec.h into util_altivec.hDiego Biurrun2016-12-14
| | | | | | | | There is no point in keeping the two separate.
* | Merge commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit 'ea7ee4b4e381e0fa731458de0cbf740430eeb013': ppc: Centralize compiler-specific altivec.h #include handling in one place Merged-by: Clément Bœsch <u@pkh.me>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 00:03:00 +0000