hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Gearbox_cpp' of ssh://thulinma@rsrclan.com:222/home/thulinma/Desktop/rassat/git/pls

Browse source
This commit is contained in:
root 2011-06-20 22:24:20 +02:00
commit 1509771809
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -15,3 +15,5 @@ AMF_Tester/AMFtest
AMF_Creator/AMFtest
ABST_Parser/Box_Parser
HTTP_Box_Parser/Box_Parser
gearbox/CPP/Client/Gearbox_Client

2
Buffer/playh264.sh
View file

@ -5,5 +5,5 @@
#ffmpeg -y -i "$1" -ar 44100 -vcodec libx264 -b 1000k -g 150 -r 20 -f flv - | ./Buffer 500
ffmpeg -i "$1" -re -acodec aac -ar 11025 -vcodec libx264 -b 700k -vpre ultrafast -refs 1 -bf 0 -g 150 -f flv - 2> /dev/null | ./Buffer 500 $2
ffmpeg -i "$1" -re -acodec aac -ar 11025 -vcodec libx264 -b 700k -vpre ultrafast -refs 1 -bf 0 -g 150 -f flv - 2> /dev/null | ./DDV_Buffer 500 $2