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: jgads/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.
  • 3 commits
  • 6 files changed
  • 2 contributors

Commits on Jul 6, 2015

  1. LGPL Changes. 

    Made the library LGPL compliant with permission from hiteshsondhi88 by
replacing the FFmpeg binary with an LGPL compliant build and updating
the license file.
    @jagged91
    jagged91 committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    5a21e0a View commit details
    Browse the repository at this point in the history

  2. Update readme to reflect LGPL.

    @jgads
    jgads committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    2cdd77f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Updated ffmpeg binaries 

    These binaries are much smaller and only allow encoding/decoding mp4
files.
    @jagged91
    jagged91 committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    eb1683e View commit details
    Browse the repository at this point in the history
Loading