summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * dvbsubdec: Use NULL instead of 0 as pointer valueDiego Biurrun2016-08-03
| |
* | Merge commit 'fc94a1acc27ab7296edce3fa81ef36691af5c134'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit 'fc94a1acc27ab7296edce3fa81ef36691af5c134': Revert "libavutil: Use an intermediate variable in AV_COPY*U" This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * Revert "libavutil: Use an intermediate variable in AV_COPY*U"Martin Storsjö2016-08-02
| | | | | | | | | | | | | | | | | | | | This reverts commit 014773b66bdff4de24f384066d1a85d2a5bb6774. Since 230b1c070, the bytewise AV_W*() macros only expand their argument once, i.e. doing exactly the same change as was done in the AV_COPY*U macros, so this change is no longer necessary. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | * commit '9806b9ab5c7fb2ac5efd8ffa8713fea0c5fd218d': Revert "Don't use expressions with side effects in macro parameters" This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * Revert "Don't use expressions with side effects in macro parameters"Martin Storsjö2016-08-02
| | | | | | | | | | | | | | | | | | This reverts commit 25bacd0a0c32ae682e6f411b1ac9020aeaabca72. Since 230b1c070, the bytewise AV_W*() macros only expand their argument once, so revert to the more readable version of these. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4'James Almer2017-03-15
|\| | | | | | | | | | | | | * commit 'f79d847400d218cfd0b95f10358fe6e65ec3c9c4': intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64 Merged-by: James Almer <jamrial@gmail.com>
| * intreadwrite: Use the __unaligned keyword on MSVC for ARM and x86_64Martin Storsjö2016-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | AV_WN64 is meant for unaligned data, but the existing av_alias* unions (without a definition for the av_alias attribute - we don't have one for MSVC) indicate to the compiler that they would have sufficient alignment for normal access, i.e. the compiler is free to assume 8 byte alignment. On ARM, this makes sure that AV_WN64 (or two consecutive AV_WN32) is done with two str instructions instead of one strd. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '230b1c070baa3b6d4bd590426a365b843d60ff50'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | | | * commit '230b1c070baa3b6d4bd590426a365b843d60ff50': intreadwrite: Add intermediate variables in the byteswise AV_W*() macros Mostly a noop. Merged for cosmetic purposes. See d83ff76ca0e1ec905ca2d5b27bd0973991eadbd9 Merged-by: James Almer <jamrial@gmail.com>
| * intreadwrite: Add intermediate variables in the byteswise AV_W*() macrosMartin Storsjö2016-08-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids issues with expanding the argument multiple times, and makes sure that it is of the right type for the following shifts. Even if the caller of a macro could be expected not to pass parameters that have side effects if expanded multiple times, these fallback codepaths are rarely, if ever, tested, so it is expected that such issues can arise. Thefore, for safety, make sure the fallback codepaths only expand the arguments once. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '014773b66bdff4de24f384066d1a85d2a5bb6774'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | | | * commit '014773b66bdff4de24f384066d1a85d2a5bb6774': libavutil: Use an intermediate variable in AV_COPY*U This commit is a noop. It would be reverted in a future merge either way. Merged-by: James Almer <jamrial@gmail.com>
| * libavutil: Use an intermediate variable in AV_COPY*UMartin Storsjö2016-07-31
| | | | | | | | | | | | | | | | | | | | | | If AV_RN and AV_WN are macros with multiple individual reads and writes, the previous version of the AV_COPYU macro would fail if the reads and writes overlap. This should not be any less efficient in any case, given a sensibly optimizing compiler. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72'James Almer2017-03-15
|\| | | | | | | | | | | | | | | | | | | * commit '25bacd0a0c32ae682e6f411b1ac9020aeaabca72': Don't use expressions with side effects in macro parameters This commit is a noop. It would be reverted in a future merge either way. Merged-by: James Almer <jamrial@gmail.com>
| * Don't use expressions with side effects in macro parametersMartin Storsjö2016-07-31
| | | | | | | | | | | | | | | | | | AV_WB32 can be implemented as a macro that expands its parameters multiple times (in case AV_HAVE_FAST_UNALIGNED isn't set and the compiler doesn't support GCC attributes); make sure not to read multiple times from the source in this case. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/tiff: Check palette shiftMichael Niedermayer2017-03-16
| | | | | | | | | | | | | | Fixes multiple runtime error: shift exponent 792 is too large for 32-bit type 'unsigned int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/wavpack: Fix multiple integer overflowsMichael Niedermayer2017-03-16
| | | | | | | | | | | | | | Fixes: 839/clusterfuzz-testcase-4871084446842880 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/simple_idct_template: Fix several integer overflowsMichael Niedermayer2017-03-16
| | | | | | | | | | | | | | | | | | | | | | Benchmarks with START_TIMER indicate that the code is faster with unsigned, (that is with the patch), there was quite some fluctuation in the numbers so this may be just random Fixes: 811/clusterfuzz-testcase-6465493076541440 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: libnpp is always nonfree, even with LGPLRicardo Constantino2017-03-15
| | | | | | | | | | | | | | | | | | libnpp was erroneously grouped up with libfdk-aac and openssl to check if --enable-nonfree wasn't passed only with --enable-gpl in 9f28db47accb31bfec40a56dd2dc19ffd366a6be. The latter two are compatible with LGPL, libnpp is not. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '7ebdffc353f3f0827864e8e3461fdc00cc243b14'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '7ebdffc353f3f0827864e8e3461fdc00cc243b14': dxv: Check to make sure we don't overrun buffers on corrupt inputs Merged-by: Clément Bœsch <u@pkh.me>
| * dxv: Check to make sure we don't overrun buffers on corrupt inputsMartin Storsjö2016-07-31
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e328178da90f44690e0076f4dbfd16da9175f441'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit 'e328178da90f44690e0076f4dbfd16da9175f441': qsvdec: only access hwaccel_context is the pixel format is QSV Merged-by: Clément Bœsch <u@pkh.me>
| * qsvdec: only access hwaccel_context is the pixel format is QSVAnton Khirnov2016-07-31
| | | | | | | | | | | | | | We do not strictly specify that hwaccel_context must be cleared if no hwaccel is used. Reported-By: wm4 <nfxjfg@googlemail.com>
* | Merge commit 'ed1cd81076434b76f37576d4d806973476a8e96c'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed1cd81076434b76f37576d4d806973476a8e96c': flac demuxer: improve probing Suggested commit very closely matches our code, except with regards to AVPROBE_SCORE_EXTENSION. The code layout is mostly merged but preserves our behaviour. Merged-by: Clément Bœsch <u@pkh.me>
| * flac demuxer: improve probingAnton Khirnov2016-07-31
| | | | | | | | | | Extend the probe function to validate the STREAMINFO block that must follow the fLaC ID tag.
* | Merge commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | * commit '5ebef79abecc3ffcc4ab0d46e203d13b068107c9': Fix instances of broken indentation found by gcc 6 Noop, see 21d3f0c02, 6089c44a2 Merged-by: Clément Bœsch <u@pkh.me>
| * Fix instances of broken indentation found by gcc 6Anton Khirnov2016-07-31
| |
* | doc: remove remaining legacy x11grab referencesClément Bœsch2017-03-15
| |
* | Merge commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '5ed4644d6de7f6112431dc2d9a5cfe9a0a75a688': x11grab: Rename internal component to "xcbgrab" Merged-by: Clément Bœsch <u@pkh.me>
| * x11grab: Rename internal component to "xcbgrab"Diego Biurrun2016-07-29
| |
* | Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c': Remove the legacy X11 screen grabber Merged-by: Clément Bœsch <u@pkh.me>
| * Remove the legacy X11 screen grabberDiego Biurrun2016-07-29
| | | | | | | | The XCB screen grabber is a drop-in replacement and not under GPL.
* | Merge commit '8495d84f0101464b15517860db33e8605586d87e'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '8495d84f0101464b15517860db33e8605586d87e': ac3dec: Add some inline hints Merged-by: Clément Bœsch <u@pkh.me>
| * ac3dec: Add some inline hintsLuca Barbato2016-07-29
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '3db51bf671defd47f2ec5ab67b11fb7730fb5e5a'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '3db51bf671defd47f2ec5ab67b11fb7730fb5e5a': ac3dec: Simplify skipping Merged-by: Clément Bœsch <u@pkh.me>
| * ac3dec: Simplify skippingLuca Barbato2016-07-29
| | | | | | | | | | | | skip_bits_long() can skip up to 32-bit ranges. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f0ccc65bc9ab9ddf1366066395564c71bcc825ee'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit 'f0ccc65bc9ab9ddf1366066395564c71bcc825ee': ac3dec: Split coupling-specific code from decode_audio_block() Merged-by: Clément Bœsch <u@pkh.me>
| * ac3dec: Split coupling-specific code from decode_audio_block()Luca Barbato2016-07-29
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a5ebe5d1217942238c641c83b24ef1106e53934a'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit 'a5ebe5d1217942238c641c83b24ef1106e53934a': ac3dec: Split spx-specific code from decode_audio_block() Merged-by: Clément Bœsch <u@pkh.me>
| * ac3dec: Split spx-specific code from decode_audio_block()Luca Barbato2016-07-29
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '2ac00d2d1d51047c6ce69d5fbe1a08392d142658'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | | | * commit '2ac00d2d1d51047c6ce69d5fbe1a08392d142658': mov: Validate the ID number This commit is a noop as the modified check is not present in FFmpeg. See d30870cc730337b7017cc194d696f68ee48f7f1d. Merged-by: Clément Bœsch <u@pkh.me>
| * mov: Validate the ID numberLuca Barbato2016-07-29
| | | | | | | | | | | | IDs in MOV start from 1. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a115eb9e750543f1d8bf951414d291069bf396c2'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit 'a115eb9e750543f1d8bf951414d291069bf396c2': mimic: do not release the newly obsolete reference at the end of decoding Merged-by: Clément Bœsch <u@pkh.me>
| * mimic: do not release the newly obsolete reference at the end of decodingAnton Khirnov2016-07-29
| | | | | | | | | | | | | | | | The reference frames are used in update_thread_context(), so modifying them after finish_setup() is a race. The frame in question will be released during the next decode call. CC: libav-stable@libav.org
* | Merge commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f': configure: Simplify license incompatibility check An extra GPLV3 list is added for libsmbclient as having it in both GPL and VERSION3 lists would cause a duplicate in the final config list. Also, for consistency, libnpp is treated the same as the other nonfree component (libfdk_aac and openssl). Merged-by: Clément Bœsch <u@pkh.me>
| * configure: Simplify license incompatibility checkDiego Biurrun2016-07-27
| |
* | avcodec/videotoolboxenc: add rc_max_bitrate control into videotoolboxSteven Liu2017-03-15
| | | | | | | | | | | | | | add kVTCompressionPropertyKey_DataRateLimits support by rc_max_bitrate Reviewed-by: Rick Kern <kernrj@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195': avconv: Check that muxing_queue exists before reading from it Mostly noop. This was fixed in FFmpeg in 7f7c494a3. The merge makes the cosmetics match but does not include the weird av_log(). Merged-by: Clément Bœsch <cboesch@gopro.com>
| * avconv: Check that muxing_queue exists before reading from itDiego Biurrun2016-07-27
| | | | | | | | This avoids a segfault on nonexisting codec names.
* | Merge commit '100fb0ddfda958da70f98feac81f924c02483789'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '100fb0ddfda958da70f98feac81f924c02483789': configure: Allow detecting and using LLVM lld-link as linker for windows Merged-by: Clément Bœsch <cboesch@gopro.com>
| * configure: Allow detecting and using LLVM lld-link as linker for windowsMartin Storsjö2016-07-26
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec'Clément Bœsch2017-03-15
|\| | | | | | | | | | | | | * commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec': configure: Move defines for controlling MSVCRT headers to the CRT detection section Merged-by: Clément Bœsch <cboesch@gopro.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 21:31:56 +0000