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: cropsly/ffmpeg-android-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: BeApp/ffmpeg-android-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 17 files changed
  • 2 contributors

Commits on Apr 19, 2016

  1. Merge tag 'v0.3' into develop 

    v0.3
    Hitesh Sondhi
    Hitesh Sondhi committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    c6bf2fe View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. Merge tag 'v0.3.2' into develop 

    v0.3.2
    Hitesh Sondhi
    Hitesh Sondhi committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    d32648d View commit details
    Browse the repository at this point in the history

Commits on May 24, 2018

  1. Add a proper way to stop ffmpeg process

    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    c3324a6 View commit details
    Browse the repository at this point in the history

  2. Upgrade gradle version and add annotationProcessor for Dagger and But… 

    …terknife
    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    45442f0 View commit details
    Browse the repository at this point in the history

  3. Add configuration to deploy on Beapp artifact repository

    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    5d06dca View commit details
    Browse the repository at this point in the history

  4. Upgrade version to 0.3.3

    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    6979897 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'release/0.3.3'

    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    9db03f8 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'release/0.3.3' into develop

    Manon Hardy
    Manon Hardy committed May 24, 2018
    Configuration menu
    Copy the full SHA
    887a38e View commit details
    Browse the repository at this point in the history

Commits on May 28, 2018

  1. Prevent NullPointerException from cancelling ffmpeg async task

    Manon Hardy
    Manon Hardy committed May 28, 2018
    Configuration menu
    Copy the full SHA
    48eb5ca View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2018

  1. Upgrade version to 0.3.4

    Manon Hardy
    Manon Hardy committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    2d565f4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/0.3.4'

    Manon Hardy
    Manon Hardy committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    7cb300e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'release/0.3.4' into develop

    Manon Hardy
    Manon Hardy committed Jun 15, 2018
    Configuration menu
    Copy the full SHA
    d90bfbc View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. Upgrade ffmpeg to version 4.0.9

    Manon Hardy
    Manon Hardy committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    3d77b11 View commit details
    Browse the repository at this point in the history

  2. Upgrade build tools, compile sdk and butterknife versions // Rename m… 

    …ain activity and associated layout
    Manon Hardy
    Manon Hardy committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    b1927f8 View commit details
    Browse the repository at this point in the history

  3. Upgrade version to 0.4.0

    Manon Hardy
    Manon Hardy committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    15889a9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'release/0.4.0'

    Manon Hardy
    Manon Hardy committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    9af7018 View commit details
    Browse the repository at this point in the history
Loading