Skip to content

Commit

Permalink
Merge pull request #3961 from raspberrypi/develop
Browse files Browse the repository at this point in the history
Release latest changes to production
  • Loading branch information
nathan-contino authored Dec 9, 2024
2 parents 49fd70c + 3f5535c commit f147553
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Log current branches and repositories
env:
REPO_FULL_NAME: ${{ github.event.pull_request.head.repo.full_name }}
run: |
echo "Current ref: $GITHUB_REF"
echo "Base ref: $GITHUB_BASE_REF"
echo "Head ref: $GITHUB_HEAD_REF"
echo "Repository: $GITHUB_REPOSITORY"
echo "Head repository: $REPO_FULL_NAME"
- name: Only allow pull requests based on master from the develop branch of the current repository
if: ${{ github.base_ref == 'master' && !(github.head_ref == 'develop' && github.event.pull_request.head.repo.full_name == github.repository) }}
run: |
Expand Down
7 changes: 7 additions & 0 deletions documentation/asciidoc/computers/camera/streaming.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ To use VLC to stream video over RTSP using a Raspberry Pi as a server, use the f
$ rpicam-vid -t 0 --inline -o - | cvlc stream:///dev/stdin --sout '#rtp{sdp=rtsp://:8554/stream1}' :demux=h264
----

For the best performance on Raspberry Pi 5, use the following command instead, which adds libav to force the H264 format:

[source,console]
----
$ rpicam-vid -t 0 --inline --libav-format h264 -o - | cvlc stream:///dev/stdin --sout '#rtp{sdp=rtsp://:8554/stream1}' :demux=h264
----

To view video streamed over RTSP using a Raspberry Pi as a client, use the following command:

[source,console]
Expand Down
2 changes: 1 addition & 1 deletion lib/pico-sdk
Submodule pico-sdk updated 268 files

0 comments on commit f147553

Please sign in to comment.