From d7901174eddef3af6e790fe860307dabb17902f9 Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Sun, 29 May 2011 14:52:26 +0200 Subject: [PATCH 1/2] Modified .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 198f1314..dfe61da3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ AMF_Tester/AMFtest AMF_Creator/AMFtest ABST_Parser/Box_Parser HTTP_Box_Parser/Box_Parser +gearbox/CPP/Client/Gearbox_Client + From dd5405d4e9caaf19e347f634df9a5b19aea396ea Mon Sep 17 00:00:00 2001 From: Erik Zandvliet Date: Mon, 30 May 2011 13:24:38 +0200 Subject: [PATCH 2/2] Calculates Running Streams + Streams to stop --- Buffer/playh264.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Buffer/playh264.sh b/Buffer/playh264.sh index c50fc61e..602d2f0a 100755 --- a/Buffer/playh264.sh +++ b/Buffer/playh264.sh @@ -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