Skip to content
Permalink
Branch: 2711
Commits on Sep 16, 2019
Commits on Sep 10, 2019
Commits on Jul 18, 2019
Commits on Jun 26, 2019
Commits on Nov 2, 2018
  1. Changelog: update

    Michael Niedermayer
    Michael Niedermayer committed Nov 2, 2018
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  2. avutil/integer: Fix integer overflow in av_mul_i()

    Michael Niedermayer
    Michael Niedermayer committed Oct 23, 2018
    Found-by: fate
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 3cc3cb6)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  3. avcodec/msrle: Check that the input is large enough to contain a end …

    Michael Niedermayer
    Michael Niedermayer committed Oct 21, 2018
    …of picture code
    
    Fixes: Timeout
    Fixes: 10625/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSRLE_fuzzer-5659651283091456
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 203ccb8)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Commits on Nov 1, 2018
  1. avformat/ftp: return AVERROR_EOF for EOF

    cus committed Nov 1, 2018
    Without this FTP just hangs on eof...
    
    Signed-off-by: Marton Balint <cus@passwd.hu>
    (cherry picked from commit 6a034ad)
  2. avcodec/libx264: remove FF_CODEC_CAP_INIT_THREADSAFE flag

    cus committed Oct 20, 2018
    Libx264 uses strtok which is not thread safe. Strtok is used in
    x264_param_default_preset in param_apply_tune in x264/common/base.c.
    Therefore the flag must be removed.
    
    x264 fixed the issue, once the fix is pushed to stable, an #if can be added
    to re-enable the flag based on X264_BUILD number.
    
    Fixes ticket #7446.
    
    Signed-off-by: Marton Balint <cus@passwd.hu>
    (cherry picked from commit b02490a)
Commits on Oct 22, 2018
  1. Prepare 4.0.3 release

    Michael Niedermayer
    Michael Niedermayer committed Oct 22, 2018
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  2. avcodec/jpeg2000dec: Fix off by 1 error in JPEG2000_PGOD_CPRL handling

    Michael Niedermayer
    Michael Niedermayer committed Oct 20, 2018
    Fixes: assertion failure
    Fixes: 10785/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5672160496975872
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 305e523)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  3. avcodec/mpeg4videodec: Fix typo in sprite delta check

    Michael Niedermayer
    Michael Niedermayer committed Oct 17, 2018
    Fixes: Integer overflow
    Fixes: 10890/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5636062181851136
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit b737317)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  4. avcodec/h264_cavlc: Check mb_skip_run

    Michael Niedermayer
    Michael Niedermayer committed Oct 4, 2018
    Fixes: 10300/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6292205497483264
    Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit f72b990)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  5. avcodec/ra144: Fix integer overflow in add_wav()

    Michael Niedermayer
    Michael Niedermayer committed Oct 10, 2018
    Fixes: signed integer overflow: -2144033225 + -5208934 cannot be represented in type 'int'
    Fixes: 10633/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-5679133791617024
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit c628214)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  6. avformat/utils: Never store negative values in last_IP_duration

    Michael Niedermayer
    Michael Niedermayer committed Oct 12, 2018
    Fixes: integer overflow compute_pkt_fields()
    Fixes: compute_pkt_usan
    
    Reported-by: Thomas Guilbert <tguilbert@chromium.org>
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 079d1a7)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  7. avformat/utils: Fix integer overflow in discontinuity check

    Michael Niedermayer
    Michael Niedermayer committed Oct 12, 2018
    Fixes: signed integer overflow: 7738135736989908991 - -7954308516317364223 cannot be represented in type 'long'
    Fixes: find_stream_info_usan
    
    Reported-by: Thomas Guilbert <tguilbert@google.com>
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 4e19cfc)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Commits on Oct 18, 2018
  1. Revert "avcodec/cbs_h264: silence errors about end_of_seq nalus"

    tmm1 committed Oct 18, 2018
    This reverts commit aec3daa.
    
    This is an incomplete fix, and did not quality for a backport.
Commits on Oct 16, 2018
  1. avcodec/cbs: ensure user_data is padded for GBC parsing

    tmm1 committed Oct 5, 2018
    Fixes crash noticed in the cbs_userdata patchset.
    
    ====ERROR: AddressSanitizer: heap-buffer-overflow on address 0x609000026c89 at pc 0x00010725d37b bp 0x7ffeea04e750 sp 0x7ffeea04e748
    READ of size 4 at 0x609000026c89 thread T0
        #0 0x10725d37a in ff_cbs_read_unsigned get_bits.h:274
        #1 0x1072d2767 in ff_cbs_read_a53_user_data cbs_misc_syntax_template.c:119
        FFmpeg#2 0x1078251a7 in h264_metadata_filter h264_metadata_bsf.c:595
        FFmpeg#3 0x105c1321d in output_packet ffmpeg.c:853
    
    0x609000026c89 is located 1 bytes to the right of 8-byte region [0x609000026c80,0x609000026c88)
    allocated by thread T0 here:
        #0 0x10aef08d7 in wrap_posix_memalign (libclang_rt.asan_osx_dynamic.dylib:x86_64h+0x578d7)
        #1 0x10aca95e6 in av_malloc mem.c:87
        FFmpeg#2 0x10ac545fe in av_buffer_allocz buffer.c:72
        FFmpeg#3 0x107263b27 in cbs_h264_read_nal_unit cbs_h264_syntax_template.c:722
        FFmpeg#4 0x10725b688 in cbs_read_fragment_content cbs.c:155
    
    Signed-off-by: Aman Gupta <aman@tmm1.net>
    (cherry picked from commit 41ed2c3)
  2. avcodec/cbs: fix crash in sei_pic_timestamp

    tmm1 committed Oct 12, 2018
    Signed-off-by: Aman Gupta <aman@tmm1.net>
    (cherry picked from commit b6c3a02)
  3. avcodec/cbs_h264: silence errors about end_of_seq nalus

    tmm1 committed Oct 8, 2018
    [ffmpeg] AVBSFContext: Decomposition unimplemented for unit 4 (type 10).
    
    Signed-off-by: Aman Gupta <aman@tmm1.net>
    (cherry picked from commit 64c50c0)
Commits on Oct 14, 2018
  1. avcodec/cuviddec: properly take deinterlacing and display delay into …

    BtbN committed Oct 13, 2018
    …account for buffer_full check
    
    Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Commits on Oct 12, 2018
  1. avcodec/h2645_parse: skip NALUs with no content after stripping all t…

    jamrial authored and tmm1 committed May 14, 2018
    …he trailing zeros
    
    The GetBitContext is effectively empty in them.
    
    Signed-off-by: James Almer <jamrial@gmail.com>
    (cherry picked from commit 9a09f4c)
Commits on Oct 9, 2018
  1. configure: <fflib>_deps: validate, reduce sensitivity

    avih authored and jamrial committed Aug 28, 2018
    - Allow to add deps in any order rather than "in linking order".
    - Expand deps chains as required rather than just once.
    - Validate that there are no cycles.
    - Validate that [after expansion] deps are limited to other fflibs.
    - Remove expectation for a specific output order of unique().
    
    Previously when adding items to <fflib>_deps, developers were
    required to add them in linking order. This can be awkward and
    bug-prone, especially when a list is not empty, e.g. when adding
    conditional deps.
    
    It also implicitly expected unique() to keep the last instance of
    recurring items such that these lists maintain their linking order
    after removing duplicate items.
    
    This patch mainly allows to add deps in any order by keeping just
    one master list in linking order, and then reordering all the
    <fflib>_deps lists to align with the master list order.
    
    This master list is LIBRARY_LIST itself, where otherwise its order
    doesn't matter.
    
    The patch also removes a limit where these deps lists were expanded
    only once. This could have resulted in incomplete expanded lists,
    or forcing devs to add already-deducable deps to avoid this issue.
    
    Note: it is possible to deduce the master list order automatically
    from the deps lists, but in this case it's probably not worth the
    added complexity, even if minor. Maintaining one list should be OK.
    
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Commits on Oct 8, 2018
  1. configure: speed up check_deps()

    avih authored and jamrial committed Aug 5, 2018
    x4 - x25 faster.
    
    check_deps() recursively enables/disables components, and its loop is
    iterated nearly 6000 times. It's particularly slow in bash - currently
    consuming more than 50% of configure runtime, and about 20% with other
    shells.
    
    This commit applies few local optimizations, most effective first:
    - Use $1 $2 ... instead of pushvar/popvar, and same at enable_deep*
    - Abort early in one notable case - empty deps, to avoid costly no-op.
    - Smaller changes which do add up:
      - Handle ${cfg}_checking locally instead of via enable[d]/disable
      - ${cfg}_checking: test done before inprogress - x2 faster in 50%+
      - one eval instead of several at the empty-deps early abort path.
    
    - The "actual work" part is unmodified - just its surroundings.
    
    Biggest speedups (relative and absolute) are observed with bash.
    
    Tested-by: Michael Niedermayer <michael@niedermayer.cc>
    Tested-by: Helmut K. C. Tessarek <tessarek@evermeet.cx>
    Tested-by: Dave Yeo <daveryeo@telus.net>
    Tested-by: Reino Wijnsma <rwijnsma@xs4all.nl>
    Signed-off-by: James Almer <jamrial@gmail.com>
    (cherry picked from commit 45499e5)
  2. configure: speed up print_enabled_components()

    avih authored and jamrial committed Jul 30, 2018
    x4 - x10 faster.
    
    Inside print_enabled components, the filter_list case invokes sed
    about 350 times to parse the same source file and extract different
    info for each arg. This is never instant, and on systems where fork is
    slow (notably MSYS2/Cygwin on windows) it takes many seconds.
    
    Change it to use sed once on the source file and set env vars with the
    parse results, then use these results inside the loop.
    
    Additionally, the cases of indev_list and outdev_list are very
    infrequent, but nevertheless they're faster, and arguably cleaner, with
    shell parameter substitutions than with command substitutions.
    
    Tested-by: Michael Niedermayer <michael@niedermayer.cc>
    Tested-by: Helmut K. C. Tessarek <tessarek@evermeet.cx>
    Tested-by: Dave Yeo <daveryeo@telus.net>
    Tested-by: Reino Wijnsma <rwijnsma@xs4all.nl>
    Signed-off-by: James Almer <jamrial@gmail.com>
    (cherry picked from commit 923586a)
  3. configure: speed up flatten_extralibs_wrapper()

    avih authored and jamrial committed Jul 30, 2018
    x50 - x200 faster.
    
    Currently configure spends 50-70% of its runtime inside a single
    function: flatten_extralibs[_wrapper] - which does string processing.
    
    During its run, nearly 20K command substitutions (subshells) are used,
    including its callees unique() and resolve(), which is the reason
    for its lengthy run.
    
    This commit avoids all subshells during its execution, speeding it up
    by about two orders of magnitude, and reducing the overall configure
    runtime by 50-70% .
    
    resolve() is rewritten to avoid subshells, and in unique() and
    flatten_extralibs() we "inline" the filter[_out] functionality.
    
    Note that logically, "unique" functionality has more than one possible
    output (depending on which of the recurring items is kept). As it
    turns out, other parts expect the last recurring item to be kept
    (which was the original behavior of uniqie()). This patch preservs
    its output order.
    
    Tested-by: Michael Niedermayer <michael@niedermayer.cc>
    Tested-by: Helmut K. C. Tessarek <tessarek@evermeet.cx>
    Tested-by: Dave Yeo <daveryeo@telus.net>
    Tested-by: Reino Wijnsma <rwijnsma@xs4all.nl>
    Signed-off-by: James Almer <jamrial@gmail.com>
    (cherry picked from commit 58b81ac)
Commits on Oct 7, 2018
  1. avformat/utils: Fix potential integer overflow in extract_extradata()

    Michael Niedermayer
    Michael Niedermayer committed Sep 26, 2018
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 0a41a8b)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  2. avcodec/unary: Improve get_unary() docs

    Michael Niedermayer
    Michael Niedermayer committed Sep 22, 2018
    Found-by: kierank
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit ad89e20)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  3. avcodec/gdv: Replace divisions by shifts in rescale()

    Michael Niedermayer
    Michael Niedermayer committed Aug 5, 2018
    Divisions tend to be slower than shifts unless the compiler optimizes them out.
    And some of these are in inner loops.
    
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit b90d8cc)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  4. avcodec/ac3dec: Fix shift signedness in mask creation

    Michael Niedermayer
    Michael Niedermayer committed Sep 21, 2018
    Fixes: 9924/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EAC3_fuzzer-5473421772193792
    Fixes: left shift of 1 by 63 places cannot be represented in type 'long long'
    
    Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit 148a216)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
  5. avcodec/eac3dec: Check that channel_map does not contain more than EA…

    Michael Niedermayer
    Michael Niedermayer committed Jun 27, 2018
    …C3_MAX_CHANNELS
    
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
    (cherry picked from commit fe315fe)
    Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Older
You can’t perform that action at this time.