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: metatronQ/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.
  • 4 commits
  • 9 files changed
  • 1 contributor

Commits on Apr 1, 2022

  1. fix: 编译问题

    metatronQ authored and metatronQ committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    f22110e View commit details
    Browse the repository at this point in the history

  2. fix: 对齐高版本Android：getFFmpeg从/app/data获取而不是/data/data，标记弃用相关转移ffmpeg方法

    metatronQ authored and metatronQ committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    7433c1e View commit details
    Browse the repository at this point in the history

  3. fix: 进程超时阻塞时提供方法供外部停止进程

    metatronQ authored and metatronQ committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    aeb55cd View commit details
    Browse the repository at this point in the history

  4. fix: ffmpeg资源错误

    metatronQ authored and metatronQ committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    9473722 View commit details
    Browse the repository at this point in the history
Loading