Skip to content

ffmpeg java #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
suncj518 wants to merge 14 commits into from
Closed

ffmpeg java #296

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bcab302
upd ffmpeg bins to v3.3
kesha-antonov May 2, 2017
fae7650
upd v
kesha-antonov May 2, 2017
bb79034
upd gradle, android-maven-gradle-plugin, gradle-bintray-plugin
kesha-antonov May 2, 2017
4a10a65
upd compileSdkVersion
kesha-antonov May 2, 2017
8fff799
upd v code
kesha-antonov May 2, 2017
e69ea47
upd gradle -> 3.5
kesha-antonov May 2, 2017
70e2c41
upd sha sums
kesha-antonov Jul 10, 2017
03e6847
upd ffmpeg with LGPL build. x264 -> openh264. cut out all others libs
kesha-antonov Jul 11, 2017
906f694
empty commit
kesha-antonov Jul 11, 2017
8643378
upd sums
kesha-antonov Jul 12, 2017
0728797
upd ffmpeg. LGPLv3. openh264. with enabled asm,yasm
kesha-antonov Jul 12, 2017
19354c2
upd ffmpeg x86. LGPLv3. openh264. with enabled asm,yasm
kesha-antonov Jul 12, 2017
de38625
added shared libs
kesha-antonov Jul 12, 2017
3f5e616
added share lib to armeabi
kesha-antonov Jul 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
upd ffmpeg with LGPL build. x264 -> openh264. cut out all others libs
  • Loading branch information
@kesha-antonov
kesha-antonov committed Jul 11, 2017
commit 03e68476464c79901c85ec2c1e61275fceb2aa5f
Binary file modified FFmpegAndroid/assets/armeabi-v7a/ffmpeg
View file
Open in desktop
Binary file not shown.
Binary file modified FFmpegAndroid/assets/x86/ffmpeg
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import android.text.TextUtils;

enum CpuArch {
x86("7693f23bdd7e615aa47c039b153365d8b0766065"),
ARMv7("ca5ef0448c031e3fff7f1bbeeca9f60987ff67d3"),
x86("a1b90d18322f4a2efa1267f7a625f58706ed0a7d"),
ARMv7("51cbc41b813661305ee58652a1c36d8bb0141467"),
NONE(null);

private String sha1;
Expand Down