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

Add RTMP stream function with FFMPEG #6735

Open
wants to merge 29 commits into
base: master
Choose a base branch
from
+2,017 −8
Open

Add RTMP stream function with FFMPEG #6735

Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f31c6ba
add RTMP stream function with FFMPEG
q414252595 Sep 24, 2020
f24a5fe
add RTMP stream function with FFMPEG
q414252595 Sep 25, 2020
8437b6c
add RTMP stream function with FFMPEG
q414252595 Sep 25, 2020
9009113
minor fix
q414252595 Sep 25, 2020
0c0befc
minor fix
edwardxliu Sep 28, 2020
3aef7cf
minor fix
edwardxliu Sep 28, 2020
6c8d550
Merge pull request #1 from AlexeyAB/master
edwardxliu Sep 28, 2020
0d0225f
add reference
edwardxliu Sep 28, 2020
f68848c
Merge branch 'master' of https://github.com/edwardxliu/darknet
edwardxliu Sep 28, 2020
da4e826
Merge pull request #2 from AlexeyAB/master
edwardxliu Nov 26, 2020
7703fac
reduce latency of input stream from IP camera
edwardxliu Dec 8, 2020
658621f
Update README.md
edwardxliu Dec 8, 2020
91e3d7d
Update README.md
edwardxliu Dec 8, 2020
3f2d3fa
input rtsp stream in stream.cpp with ffmpeg
edwardxliu Dec 14, 2020
7102c70
Merge branch 'master' of https://github.com/edwardxliu/darknet
edwardxliu Dec 14, 2020
50660eb
update
edwardxliu Dec 14, 2020
816210a
update
edwardxliu Dec 14, 2020
e6020cc
Merge pull request #3 from AlexeyAB/master
edwardxliu Dec 14, 2020
4fddf7c
upate
edwardxliu Dec 15, 2020
e6e6f71
Merge branch 'master' of https://github.com/edwardxliu/darknet
edwardxliu Dec 15, 2020
b141cef
minor fix
edwardxliu Dec 15, 2020
3298cbe
update
edwardxliu Dec 15, 2020
2067e38
update
edwardxliu Dec 15, 2020
25ffaf4
fix set-env issue
edwardxliu Dec 15, 2020
22a44da
fix set-env issue
edwardxliu Dec 15, 2020
b1538bf
fix set-env issue
edwardxliu Dec 15, 2020
3dd41fd
Merge branch 'master' into master
cenit Apr 16, 2021
b64f25a
Merge branch 'master' into master
cenit Aug 26, 2023
b9e920d
Merge branch 'master' into pr/6735
cenit Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into master
@cenit
cenit authored Aug 26, 2023
commit b64f25a0954279fe273c9d783a2fdae0bd64512c
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -76,7 +76,7 @@ NVCC=nvcc
OPTS=-Ofast
LDFLAGS= -lm -pthread
COMMON= -Iinclude/ -I3rdparty/stb/include
CFLAGS=-Wall -Wfatal-errors -Wno-unused-result -Wno-unknown-pragmas -fPIC -fpermissive
CFLAGS=-Wall -Wfatal-errors -Wno-unused-result -Wno-unknown-pragmas -fPIC -fpermissive -rdynamic

ifeq ($(STREAM), 1)
COMMON+= -DSTREAM
You are viewing a condensed version of this merge commit. You can view the full changes here.