-
- Downloads
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
Conflicts: bigbluebutton-client/resources/config.xml.template bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
Showing
- akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala 1 addition, 1 deletion...ain/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
- bbb-api-demo/src/main/webapp/demo12.jsp 1 addition, 1 deletionbbb-api-demo/src/main/webapp/demo12.jsp
- bbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-linux-x86.jar
- bbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-linux-x86_64.jar
- bbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-macosx-x86_64.jar
- bbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-windows-x86.jar
- bbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg-windows-x86_64.jar
- bbb-screenshare/app/jws/lib/ffmpeg.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/ffmpeg.jar
- bbb-screenshare/app/jws/lib/javacpp.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacpp.jar
- bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar 0 additions, 0 deletionsbbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar
- bbb-screenshare/app/screenshare.jnlp 51 additions, 0 deletionsbbb-screenshare/app/screenshare.jnlp
- bbb-screenshare/app/src/main/java/org/bigbluebutton/app/screenshare/red5/Red5AppService.java 103 additions, 88 deletions...rg/bigbluebutton/app/screenshare/red5/Red5AppService.java
- bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar 0 additions, 0 deletions...tive-libs/ffmpeg-linux-x86/ffmpeg-3.0.2-1.2-linux-x86.jar
- bbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh 3 additions, 2 deletionsbbb-screenshare/jws/native-libs/ffmpeg-linux-x86/sign-jar.sh
- bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar 0 additions, 0 deletions...ibs/ffmpeg-linux-x86_64/ffmpeg-3.0.2-1.2-linux-x86_64.jar
- bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/ffmpeg-linux-x86_64.jar 0 additions, 0 deletions...s/native-libs/ffmpeg-linux-x86_64/ffmpeg-linux-x86_64.jar
- bbb-screenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh 2 additions, 1 deletion...reenshare/jws/native-libs/ffmpeg-linux-x86_64/sign-jar.sh
- bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar 0 additions, 0 deletions...s/ffmpeg-macosx-x86_64/ffmpeg-3.0.2-1.2-macosx-x86_64.jar
- bbb-screenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh 3 additions, 0 deletions...eenshare/jws/native-libs/ffmpeg-macosx-x86_64/sign-jar.sh
- bbb-screenshare/jws/native-libs/ffmpeg-windows-x86/deploy.sh 0 additions, 4 deletionsbbb-screenshare/jws/native-libs/ffmpeg-windows-x86/deploy.sh
Loading
Please register or sign in to comment