Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: bravobit/FFmpeg-Android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: getnexar/FFmpeg-Android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 11 commits
  • 15 files changed
  • 3 contributors

Commits on Jul 3, 2019

  1. rm x86 binaries, rm ffprobe

    Irad Cohen committed Jul 3, 2019
    Copy the full SHA
    ea8cffc View commit details

Commits on Aug 11, 2019

  1. let it run on Android Q 

    see #126
    @alexcohn
    alexcohn committed Aug 11, 2019
    Copy the full SHA
    881e007 View commit details

Commits on Apr 7, 2020

  1. use true names for executables 

    relying on https://developer.android.com/ndk/guides/wrap-script#packaging_wrapsh
    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    e50d1c4 View commit details

  2. remove unnecessary CpuArch

    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    9dfb7db View commit details

  3. cleanup execute() 

    lint complains about concatenate()
    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    a4ec57c View commit details

  4. make sure the system extracts the binaries

    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    8060c61 View commit details

  5. upgrade gradle plugin and androidx

    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    cd40dfe View commit details

  6. Revert "use true names for executables" 

    This reverts commit e50d1c4
See https://issuetracker.google.com/issues/152645643 for discussion: this is not supposed to work, wrap.sh is a special well-known name. Also, older devices (e.g. API 24) don't install files from libs directory if they don't match the expected "lib.*\.so" pattern.
    @alexcohn
    alexcohn committed Apr 7, 2020
    Copy the full SHA
    58556d1 View commit details

Commits on Sep 13, 2020

  1. Merge remote-tracking branch 'origin/v1.1.5-no-ffprobe-no-x86'

    Irad Cohen committed Sep 13, 2020
    Copy the full SHA
    70ec64b View commit details

  2. Merge remote-tracking branch 'alexcohn/pull_request_Q' into irad/AN-4… 

    …759-target-29
    Irad Cohen committed Sep 13, 2020
    Copy the full SHA
    3015cc5 View commit details

  3. Merge pull request #3 from getnexar/irad/AN-4759-target-29 

    AN-4759: Allow to run on target 29
    Irad Cohen authored Sep 13, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a09c6ba View commit details
Loading