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: georgeyang1024/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: cropsly/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
  • 13 files changed
  • 3 contributors

Commits on Oct 7, 2014

  1. Merge tag 'v0.2.4' into develop 

    v0.2.4
    @hiteshsondhi88
    hiteshsondhi88 committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    f1ab02d View commit details
    Browse the repository at this point in the history

  2. Merge tag 'v0.2.5' into develop 

    v0.2.5
    @hiteshsondhi88
    hiteshsondhi88 committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    958fde4 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into develop

    @hiteshsondhi88
    hiteshsondhi88 committed Oct 7, 2014
    Configuration menu
    Copy the full SHA
    f100509 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2015

  1. Merge branch 'develop' of https://github.com/hiteshsondhi88/ffmpeg-an… 

    …droid-java into develop
    @hiteshsondhi88
    hiteshsondhi88 committed Mar 19, 2015
    Configuration menu
    Copy the full SHA
    0b7bfd4 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2015

  1. Add support for 64bit devices 

    * x86_64 is supported by x86
* arm64-v8a is supported by armeabi-v7a
    Shahar Barsheshet authored and Shahar Barsheshet committed Dec 8, 2015
    Configuration menu
    Copy the full SHA
    64f7314 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2016

  1. Updated Javadocs

    @hiteshsondhi88
    hiteshsondhi88 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    5498700 View commit details
    Browse the repository at this point in the history

  2. Updated Links

    @hiteshsondhi88
    hiteshsondhi88 committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    3ed9b5c View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Merge pull request cropsly#57 from Shahar2k5/master 

    Add support for 64bit devices
    @hiteshsondhi88
    hiteshsondhi88 committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    81db8a6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into develop

    Hitesh Sondhi committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    628ef00 View commit details
    Browse the repository at this point in the history

  3. Updated binaries

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

  4. Removed neon FFmpeg binary to change sdk size

    Hitesh Sondhi committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    62ca722 View commit details
    Browse the repository at this point in the history

  5. Updated Test Cases

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

  6. Updated README

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

  7. Merge branch 'release/v0.3'

    Hitesh Sondhi committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    0eae163 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. 0.3.2 Release Changes

    Hitesh Sondhi committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    05af1a4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'release/v0.3.2'

    Hitesh Sondhi committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    6fd8356 View commit details
    Browse the repository at this point in the history
Loading