Skip to content
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

Jump to bottom

Sk/merge upstream #13

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open

Sk/merge upstream #13

wants to merge 79 commits into from

Commits on Feb 25, 2022

  1. Update to FFmpeg 5

    @scriptorian
    scriptorian committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    b54852d View commit details
    Browse the repository at this point in the history

  2. Update linux scripts and test build for FFmpeg 5

    @scriptorian
    scriptorian committed Feb 25, 2022
    Configuration menu
    Copy the full SHA
    6c4f8ed View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2022

  1. fix: building for macos on m1

    @mint-dewit
    mint-dewit committed Feb 27, 2022
    Configuration menu
    Copy the full SHA
    0c4bf22 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2022

  1. Merge pull request Streampunk#86 from baltedewit/master 

    fix: building for macos on m1
    @scriptorian
    scriptorian authored Feb 28, 2022
    Configuration menu
    Copy the full SHA
    26b03a2 View commit details
    Browse the repository at this point in the history

  2. Update for FFmpeg 5

    @scriptorian
    scriptorian committed Feb 28, 2022
    Configuration menu
    Copy the full SHA
    57bfdf3 View commit details
    Browse the repository at this point in the history

  3. Streampunk#85 Add arm64 to supported linux platforms

    @scriptorian
    scriptorian committed Feb 28, 2022
    Configuration menu
    Copy the full SHA
    e3a099c View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Bump minimist from 1.2.5 to 1.2.6 

    Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    85ae16e View commit details
    Browse the repository at this point in the history

  2. Merge pull request Streampunk#91 from Streampunk/dependabot/npm_and_y… 

    …arn/minimist-1.2.6

Bump minimist from 1.2.5 to 1.2.6
    @scriptorian
    scriptorian authored Mar 31, 2022
    Configuration menu
    Copy the full SHA
    f3ce4e1 View commit details
    Browse the repository at this point in the history

  3. Security update

    @scriptorian
    scriptorian committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    aee5ff9 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Use pkg-config on linux to resolve ffmpeg link dependencies

    @skadisch
    skadisch committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    fb69649 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2022

  1. Support for ffmpeg 5.0 on linux

    @paulgrammer
    paulgrammer authored May 8, 2022
    Configuration menu
    Copy the full SHA
    0368cd2 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2022

  1. Allow to pass hw device to filters and allocate hw frame contexts

    Mateusz Garbowski committed Jun 13, 2022
    Configuration menu
    Copy the full SHA
    38e03de View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2022

  1. feat: set logging callback, not working yet

    @piercus
    piercus committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    ebe3fa2 View commit details
    Browse the repository at this point in the history

  2. progress

    @piercus
    piercus committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    8dc6c1f View commit details
    Browse the repository at this point in the history

  3. fix: first working version, thread not released

    @piercus
    piercus committed Oct 6, 2022
    Configuration menu
    Copy the full SHA
    96ac601 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2022

  1. fix: Streampunk#107

    @piercus
    piercus committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    85b40d2 View commit details
    Browse the repository at this point in the history

  2. Streampunk#107 fix README and tests

    @piercus
    piercus committed Oct 7, 2022
    Configuration menu
    Copy the full SHA
    af09d68 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2022

  1. Merge pull request Streampunk#109 from piercus/set-logging-callback 

    Set logging callback
    @scriptorian
    scriptorian authored Nov 12, 2022
    Configuration menu
    Copy the full SHA
    7b5d272 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Streampunk#96 from paulgrammer/paulgrammer-patch-1 

    Support for ffmpeg 5.0 on linux
    @scriptorian
    scriptorian authored Nov 12, 2022
    Configuration menu
    Copy the full SHA
    810a593 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Streampunk#100 from Tellyo/pr-filters-hwaccel 

    Allow to pass hw device to filters and allocate hw frame contexts
    @scriptorian
    scriptorian authored Nov 12, 2022
    Configuration menu
    Copy the full SHA
    d5f006c View commit details
    Browse the repository at this point in the history

  4. Merge pull request Streampunk#92 from k13-engineering/feature/pkg-config 

    Use pkg-config on linux to resolve ffmpeg link dependencies
    @scriptorian
    scriptorian authored Nov 12, 2022
    Configuration menu
    Copy the full SHA
    87a6722 View commit details
    Browse the repository at this point in the history

  5. Fix lint errors

    @scriptorian
    scriptorian committed Nov 12, 2022
    Configuration menu
    Copy the full SHA
    2bd1fe2 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Merge remote-tracking branch 'upstream/master' into sk/merge-upstream 

    # Conflicts:
#	binding.gyp
#	package-lock.json
#	package.json
    @srikanth-descript
    srikanth-descript committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    d305886 View commit details
    Browse the repository at this point in the history

  2. Fixup after merge

    @srikanth-descript
    srikanth-descript committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    acfff75 View commit details
    Browse the repository at this point in the history

  3. Moving up ubuntu version and build

    @srikanth-descript
    srikanth-descript committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    ad017b5 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Updating pre-build scripts

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    a0182f8 View commit details
    Browse the repository at this point in the history

  2. Adding git

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    943c4d7 View commit details
    Browse the repository at this point in the history

  3. Adding git-lfs

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1360c96 View commit details
    Browse the repository at this point in the history

  4. Adding distutils for mac

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    401651a View commit details
    Browse the repository at this point in the history

  5. Adding setuptools for python3.12

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    5b69096 View commit details
    Browse the repository at this point in the history

  6. Pinning python to 3.10

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    54150ba View commit details
    Browse the repository at this point in the history

  7. Adding bashrc

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    d117d0c View commit details
    Browse the repository at this point in the history

  8. Really?

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    a25fdaf View commit details
    Browse the repository at this point in the history

  9. Trying to go back to 3.12

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    e9cf877 View commit details
    Browse the repository at this point in the history

  10. Updating package-lock

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    1f6ae3b View commit details
    Browse the repository at this point in the history

  11. Adding setuptools

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3e076ba View commit details
    Browse the repository at this point in the history

  12. updating node-gyp

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6d496da View commit details
    Browse the repository at this point in the history

  13. Updating node-gyp for prebuild

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    b5fc432 View commit details
    Browse the repository at this point in the history

  14. Updating package jobs and patches

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    6f645d3 View commit details
    Browse the repository at this point in the history

  15. WCGW?

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3d570f8 View commit details
    Browse the repository at this point in the history

  16. Creating release

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    d9e152d View commit details
    Browse the repository at this point in the history

  17. Adding versions

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    3a213e0 View commit details
    Browse the repository at this point in the history

  18. Fixing patch message

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    9615339 View commit details
    Browse the repository at this point in the history

  19. Fixing prebuild version

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    7897126 View commit details
    Browse the repository at this point in the history

  20. Adding version.

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8bdeefa View commit details
    Browse the repository at this point in the history

  21. Set node user

    @srikanth-descript
    srikanth-descript committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    beef236 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. More package changes

    @srikanth-descript
    srikanth-descript committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    3ce8bda View commit details
    Browse the repository at this point in the history

  2. This version of beam coder required v4

    @srikanth-descript
    srikanth-descript committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    aacb47f View commit details
    Browse the repository at this point in the history

  3. Last known good version compatible with prebuild

    @srikanth-descript
    srikanth-descript committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    39115d6 View commit details
    Browse the repository at this point in the history

  4. updating tags

    @srikanth-descript
    srikanth-descript committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    9607b47 View commit details
    Browse the repository at this point in the history

  5. Fixing build tag

    @srikanth-descript
    srikanth-descript committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    ddbc0c5 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Updating RC to 5 to fix FFMPEG dependency on mac

    @srikanth-descript
    srikanth-descript committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    344815b View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Adding log

    @srikanth-descript
    srikanth-descript committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    5971f6b View commit details
    Browse the repository at this point in the history

  2. Removing /WX to avoid windows build failures on deprecated functions

    @srikanth-descript
    srikanth-descript committed Dec 21, 2023
    Configuration menu
    Copy the full SHA
    9dfc562 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Adding ffmpeg/ffprobe to linux prebuild

    @srikanth-descript
    srikanth-descript committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    dd37776 View commit details
    Browse the repository at this point in the history

  2. Moving up version to rc.6

    @srikanth-descript
    srikanth-descript committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    75bb34a View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Updating pre-install script

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    0ec8a28 View commit details
    Browse the repository at this point in the history

  2. Adding support for shared build from descripinc/ffmpeg-build-script f… 

    …or lix
    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    02e3274 View commit details
    Browse the repository at this point in the history

  3. GIT

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5d8046a View commit details
    Browse the repository at this point in the history

  4. GITLFS

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e4c7c59 View commit details
    Browse the repository at this point in the history

  5. Adding write permissions to uplaod artifacts

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5f888e1 View commit details
    Browse the repository at this point in the history

  6. Fixing indentation

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    91a6bbb View commit details
    Browse the repository at this point in the history

  7. indent

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e7e3ed6 View commit details
    Browse the repository at this point in the history

  8. Split windows and macos jobs

    Srikanth Kotagiri committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    1bf57f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. Working linux prebuild

    Srikanth Kotagiri committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    041b73e View commit details
    Browse the repository at this point in the history

  2. Updating package RC number

    @srikanth-descript
    srikanth-descript committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    070f655 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. New beamcoder prebuild release with ffmpeg 6

    Srikanth Kotagiri committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    4257cfd View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. RC.10 release commit

    @srikanth-descript
    srikanth-descript committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ed71d82 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Moving ffmpeg to dynamic dependency

    @srikanth-descript
    srikanth-descript committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    b27dc79 View commit details
    Browse the repository at this point in the history

  2. Bumping up ffmpeg-ffprobe-static release

    @srikanth-descript
    srikanth-descript committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    07e75cc View commit details
    Browse the repository at this point in the history

  3. Including ffmpeg/ffprobe statics

    @srikanth-descript
    srikanth-descript committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    039df40 View commit details
    Browse the repository at this point in the history

  4. Fixup

    @srikanth-descript
    srikanth-descript committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6483dca View commit details
    Browse the repository at this point in the history

  5. Fixing NPM_INTEGRITY error

    @srikanth-descript
    srikanth-descript committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    0792423 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Changing the build environment

    @srikanth-descript
    srikanth-descript committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    4ba327c View commit details
    Browse the repository at this point in the history

  2. Updating install script

    @srikanth-descript
    srikanth-descript committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    85c8af8 View commit details
    Browse the repository at this point in the history

  3. Updating builder environment

    @srikanth-descript
    srikanth-descript committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    d6659c2 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Bringing ffmpeg version to 5.1

    @srikanth-descript
    srikanth-descript committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    0fcd23f View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. Fixing Intel max builds

    @srikanth-descript
    srikanth-descript committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    9d0b142 View commit details
    Browse the repository at this point in the history

  2. Bumping RC to 18. Making it work with intel macs

    @srikanth-descript
    srikanth-descript committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    13a7f14 View commit details
    Browse the repository at this point in the history