Skip to content

Commit

Permalink
Added sctp and webm/matroska support - thanks go to gsoc devs
Browse files Browse the repository at this point in the history
  • Loading branch information
mondain committed Oct 15, 2015
1 parent 2102f22 commit 60b569c
Show file tree
Hide file tree
Showing 172 changed files with 5,032 additions and 546 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<compilerVersion>1.6</compilerVersion>
<compilerVersion>1.7</compilerVersion>
<fork>true</fork>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
<executable>${maven.compiler.executable}</executable>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/annotations/Anonymous.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/annotations/DeclarePrivate.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/annotations/DeclareProtected.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/annotations/DontSerialize.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/annotations/RemoteClass.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/ICacheStore.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/ICacheable.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/impl/CacheImpl.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/impl/CacheableImpl.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/impl/EhCacheImpl.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/cache/impl/NoCacheImpl.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/AACAudio.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/AVCVideo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/AudioCodec.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/IAudioStreamCodec.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/IStreamCodecInfo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/IVideoStreamCodec.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/ScreenVideo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/ScreenVideo2.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/SorensonVideo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/StreamCodecInfo.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/red5/codec/VideoCodec.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/red5/io/BufferType.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/*
* RED5 Open Source Flash Server - https://github.com/Red5/
*
* Copyright 2006-2013 by respective authors (see below). All rights reserved.
*
*
* Copyright 2006-2015 by respective authors (see below). All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down
Loading

0 comments on commit 60b569c

Please sign in to comment.