summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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>
| * ppc: Centralize compiler-specific altivec.h #include handling in one placeDiego Biurrun2016-12-14
| | | | | | | | Also move #includes into canonical order where appropriate.
* | Merge commit '39929e55eb13eeb8dfbe1bc99301fecf6b8942dd'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '39929e55eb13eeb8dfbe1bc99301fecf6b8942dd': ppc: hevcdsp: Use shorthands for vector types Merged-by: Clément Bœsch <u@pkh.me>
| * ppc: hevcdsp: Use shorthands for vector typesDiego Biurrun2016-12-14
| | | | | | | | This is more consistent and fixes compilation with clang.
* | Merge commit '554e55bbf0e4a3640a784cb512b816e776c56333'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | * commit '554e55bbf0e4a3640a784cb512b816e776c56333': decode.h: Add missing headers to fix standalone compilation Merged-by: Clément Bœsch <u@pkh.me>
| * decode.h: Add missing headers to fix standalone compilationDiego Biurrun2016-12-14
| |
* | Merge commit '343e2833994655c252d5236a3394bf6db7a4d8b1'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit '343e2833994655c252d5236a3394bf6db7a4d8b1': pthread_frame: use better memory orders for frame progress This commit is a noop, see c358c62550e60a150c49f192d72631142a6eedd6 Merged-by: Clément Bœsch <u@pkh.me>
| * pthread_frame: use better memory orders for frame progressWan-Teh Chang2016-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves commit 59c70227405c214b29971e6272f3a3ff6fcce3d0. In ff_thread_report_progress(), the fast code path can load progress[field] with the relaxed memory order, and the slow code path can store progress[field] with the release memory order. These changes are mainly intended to avoid confusion when one inspects the source code. They are unlikely to have measurable performance improvement. ff_thread_report_progress() and ff_thread_await_progress() form a pair. ff_thread_await_progress() reads progress[field] with the acquire memory order (in the fast code path). Therefore, one expects to see ff_thread_report_progress() write progress[field] with the matching release memory order. In the fast code path in ff_thread_report_progress(), the atomic load of progress[field] doesn't need the acquire memory order because the calling thread is trying to make the data it just decoded visible to the other threads, rather than trying to read the data decoded by other threads. In ff_thread_get_buffer(), initialize progress[0] and progress[1] using atomic_init(). Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'e94b9313b21c3d91a36ef064f7fe3e867616f47f'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit 'e94b9313b21c3d91a36ef064f7fe3e867616f47f': fate: Add h264 test for frame num gaps This commit is a noop, see b7e4ea0c80f4b3e060625fd97ffdd3b9689bfcd1 Merged-by: Clément Bœsch <u@pkh.me>
| * fate: Add h264 test for frame num gapsDerek Buitenhuis2016-12-14
| | | | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '5c7f2cf81df06614f255f061850132355a01d75e'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | * commit '5c7f2cf81df06614f255f061850132355a01d75e': h264_slice: Wait for refs to be available before we use them in error concealment This commit is a noop, see 4413e950b26396bfb797168e4f81164a022cc6f3 Merged-by: Clément Bœsch <u@pkh.me>
| * h264_slice: Wait for refs to be available before we use them in error ↵Derek Buitenhuis2016-12-14
| | | | | | | | | | | | | | | | | | | | | | | | | | concealment This could happen when there was a frame number gap and frame threading was used. Debugging-by: Ronald S. Bultje <rsbultje@gmail.com> Debugging-by: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81'Clément Bœsch2017-04-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81': hevc: decouple calling get_format() from exporting the SPS parameters See 786032cad8ecabe577d9cff0356da6e9e9488a2d (which has been reverted and replaced with Anton's version to reduce diffs between the two projects). Merged-by: Clément Bœsch <u@pkh.me>
| * hevc: decouple calling get_format() from exporting the SPS parametersAnton Khirnov2016-12-14
| | | | | | | | | | This makes sure ff_get_format() does not get called unnecessarily from update_thread_context().
* | avformat/concatdec: fix the h264 annexb extradata checkJames Almer2017-04-25
| | | | | | | | The start code can be either in the first three or four bytes.
* | Merge commit '730c02326094bcfb1fa67f10a7e7b22f03f5a88f'Clément Bœsch2017-04-25
|\| | | | | | | | | | | | | * commit '730c02326094bcfb1fa67f10a7e7b22f03f5a88f': binkaudio: switch to the new send/receive API Merged-by: Clément Bœsch <u@pkh.me>
| * binkaudio: switch to the new send/receive APIAnton Khirnov2016-12-14
| | | | | | | | | | | | It is more natural for this codec and allows to avoid awkward constructs like "consuming 0 bytes from input". Also, keep a reference to the input packet to avoid unnecessary copying.
* | Merge commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91'Clément Bœsch2017-04-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa1749dd34c55fb997c97dfc4da9383c9976ab91': vp9: split superframes in the filtering stage before actual decoding This commit is a noop. 2017-04-24 20:45:04 @ubitux BBB: btw, do you think you can get the bsf thing this week or we should skip it to give you more time and go on with the merges? 2017-04-24 20:45:20 @BBB I’m not sure I’ll finish it that soon 2017-04-24 20:45:26 @BBB I’d skip it and leave it for later 2017-04-24 20:45:35 @BBB I’ll do it, I promise, but I Can’t guarantee it’ll be done by $date Merged-by: Clément Bœsch <u@pkh.me>
| * vp9: split superframes in the filtering stage before actual decodingAnton Khirnov2016-12-14
| | | | | | | | | | Significantly increases the efficiency of frame threading, since individual frames in a superframe can now be decoded in parallel.
* | avfilter/af_biquads: allow filtering only selected channelsPaul B Mahol2017-04-25
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | fate/exr : fix pix_fmtMartin Vignali2017-04-25
| | | | | | | | | | | | rgb_scanline_pxr24_half_uint32_13x9.exr doesn't have alpha Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tools/target_dec_fuzzer: Remove FuzzerInterface.h dependancyMichael Niedermayer2017-04-25
| | | | | | | | | | | | | | The header is not always available in the docker build environment Suggested-by: Kostya Serebryany Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: Add test for pkt_size of ffprobeMichael Niedermayer2017-04-24
| | | | | | | | | | Suggested-by: James Almer Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Make tools/target_dec_*_fuzzer buildable with configure and makeMichael Niedermayer2017-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | tools/target_dec_fuzzer: Fix build with default FFmpeg build flagsMichael Niedermayer2017-04-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add lumakey filterPaul B Mahol2017-04-24
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/crystalhd: Another attempt at using mpeg4_unpack_bframes bsfPhilip Langdale2017-04-23
| | | | | | | | | | | | | | | | | | | | I tried doing this before, but it resulted in weird behaviour with certain samples. I want to say I think I've got it sorted out now, and the new autobsf stuff makes it trivial to turn on. The native support for packed bframes is buggy and I think buggy in ways beyond what I already try to account for, so this should be a net improvements.
* | avcodec/crystalhd: Explicitly set frame pts at all timesPhilip Langdale2017-04-23
| | | | | | | | | | | | | | | | | | | | | | Previously, the pts value was initialised to AV_NOPTS_VALUE and so it was not necessary to always set it. Now, with the new-new decode API, this is no longer true. I'm not sure why I avoided setting the pts when the decoder value was also AV_NOPTS_VALUE - it clearly wouldn't have changed anything previously, but here we are. Failing to do this, means the frame pts will be some random uninitalised value.
* | decode: Initialize ret before using itVittorio Giovara2017-04-23
| | | | | | | | | | | | | | libavcodec/decode.c:608:9: warning: variable 'ret' is used uninitialized whenever 'if' condition is false (cherry picked from libav commit efddf2c09aed7400c73ecf327f86a4d0452b94b5)
* | avcodec/movtextenc: Ignore unmatched closing style tagsPhilip Langdale2017-04-23
| | | | | | | | | | | | | | | | The existing code will segfault if a closing tag shows up when there was never an opening tag. This isn't a well formed style, but it's also not a reason to crash. Fixes: https://trac.ffmpeg.org/ticket/6303
* | webm_dash_manifest_demuxer: Fix initialization range for files with cues at ↵Derek Buitenhuis2017-04-23
| | | | | | | | | | | | | | | | | | | | | | | | the front The WebM DASH spec states: The Initialization Segment shall not contain Clusters or Cues. The Segment Index corresponds to the Cues. Previously, it included the cues if they were at the front. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | webm_dash_manifest_demuxer: Fix UB in cue timestamp string code and make it ↵Derek Buitenhuis2017-04-23
| | | | | | | | | | | | | | | | | | | | | | actually work Output was apparently not tested for correctness. Passing overlapping memory to snprintf causes undefined behavior, and usually resulted in only the very last timestamp being written to metadata, and not a list at all. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>