Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Saentist/tvheadend
Browse files Browse the repository at this point in the history
  • Loading branch information
Saentist committed Apr 26, 2023
2 parents dc9394a + 71c3967 commit 6f00da2
Show file tree
Hide file tree
Showing 7 changed files with 48 additions and 262 deletions.
191 changes: 0 additions & 191 deletions .github/workflows/build.yml

This file was deleted.

45 changes: 0 additions & 45 deletions .github/workflows/coverity.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
on:
pull_request: {}
push:
branches:
- main
- master
paths:
- .github/workflows/semgrep.yml
schedule:
# random HH:MM to avoid a load spike on GitHub Actions at 00:00
- cron: 51 20 * * *
name: Semgrep
jobs:
semgrep:
name: Scan
runs-on: ubuntu-20.04
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
container:
image: returntocorp/semgrep
steps:
- uses: actions/checkout@v3
- run: semgrep ci --suppress-errors
24 changes: 0 additions & 24 deletions .github/workflows/test-compile.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .semgrepignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## ignored
--exclude src/parsers/parser_teletext.c
4 changes: 2 additions & 2 deletions Makefile.ffmpeg
Original file line number Diff line number Diff line change
Expand Up @@ -566,14 +566,14 @@ endif

ifeq (yes,$(CONFIG_NVENC))

## YOU MUST INSTALL CUDA from NVIDIA for "libnpp"
## YOU MUST INSTALL CUDA from NVIDIA for "libnpp"
EXTLIBS += nvenc cuvid libnpp
ENCODERS += h264_nvenc hevc_nvenc
DECODERS += h264_cuvid hevc_cuvid
HWACCELS += h264_nvdec hevc_nvdec vp8_nvdec vp9_nvdec mjpeg_nvdec mpeg1_nvdec mpeg2_nvdec mpeg4_nvdec
ECFLAGS += -I/usr/local/cuda/include

## NVIDIA LIB for "libnpp"
## NVIDIA LIB for "libnpp"
CONFIGURE_FFMPEG += --extra-ldflags=-L/usr/local/cuda/lib64

$(LIB_ROOT)/$(FFNVCODEC)/.tvh_download:
Expand Down
21 changes: 21 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Security Policy

## Supported Versions

Use this section to tell people about which versions of your project are
currently being supported with security updates.

| Version | Supported |
| ------- | ------------------ |
| 5.1.x | :white_check_mark: |
| 5.0.x | :x: |
| 4.0.x | :white_check_mark: |
| < 4.0 | :x: |

## Reporting a Vulnerability

Use this section to tell people how to report a vulnerability.

Tell them where to go, how often they can expect to get an update on a
reported vulnerability, what to expect if the vulnerability is accepted or
declined, etc.

0 comments on commit 6f00da2

Please sign in to comment.