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: bilibili/ijkplayer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: wuhongsheng/ijkplayer
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.
  • 7 commits
  • 11 files changed
  • 1 contributor

Commits on May 9, 2021

  1. 增加录像截屏等方法

    hswu3 committed May 9, 2021
    Configuration menu
    Copy the full SHA
    53b8835 View commit details
    Browse the repository at this point in the history

  2. 增加https|rtsp等协议支持

    hswu3 committed May 9, 2021
    Configuration menu
    Copy the full SHA
    f53f070 View commit details
    Browse the repository at this point in the history

  3. 更新构建环境

    hswu3 committed May 9, 2021
    Configuration menu
    Copy the full SHA
    5708cac View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2021

  1. 更新构建环境

    hswu3 committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    c666c3c View commit details
    Browse the repository at this point in the history

  2. 更新构建环境

    hswu3 committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    db389a1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/bilibili/ijkplayer into b… 

    …ilibili-master

# Conflicts:
#	ijkmedia/ijkplayer/ff_ffplay_def.h
#	init-android.sh
    hswu3 committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    6fab7fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bilibili-master'

    hswu3 committed Jul 19, 2021
    Configuration menu
    Copy the full SHA
    341fbd4 View commit details
    Browse the repository at this point in the history
Loading