Added MIT license support

robins-project · Nov 17, 2017 · 75681ee · 75681ee
1 parent f10cebc
commit 75681ee
Show file tree

Hide file tree

Showing 6 changed files with 89 additions and 95 deletions.
diff --git a/GPMF_parser.c b/GPMF_parser.c
@@ -5,13 +5,12 @@
  *  @version 1.1.0
  * 
  *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
- *   
- *  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
- *  
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
  *  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.

diff --git a/GPMF_parser.h b/GPMF_parser.h
@@ -5,13 +5,12 @@
  *  @version 1.1.0
  * 
  *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
- *   
- *  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
- *  
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
  *  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.

diff --git a/demo/GPMF_demo.c b/demo/GPMF_demo.c
@@ -1,24 +1,23 @@
 /*! @file GPMF_demo.c
-*
-*  @brief Demo to extract GPMF from an MP4
-*
-*  @version 1.0.1
-*
-*  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
-*
-*  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.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
+ *
+ *  @brief Demo to extract GPMF from an MP4
+ *
+ *  @version 1.0.1
+ *
+ *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
+ *  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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 #include <stdlib.h>
 #include <stdio.h>

diff --git a/demo/GPMF_mp4reader.c b/demo/GPMF_mp4reader.c
@@ -1,28 +1,26 @@
 /*! @file GPMF_mp4reader.c
-*
-*  @brief Way Too Crude MP4 reader
-*
-*  @version 1.1.1
-*
-*  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
-*
-*  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.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
+ *
+ *  @brief Way Too Crude MP4 reader
+ *
+ *  @version 1.1.1
+ *
+ *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
+ *  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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 /* This is not an elegant MP4 parser, only used to help demonstrate extraction of GPMF */
 
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

diff --git a/demo/GPMF_mp4reader.h b/demo/GPMF_mp4reader.h
@@ -1,24 +1,23 @@
 /*! @file GPMF_mp4reader.h
-*
-*  @brief Way Too Crude MP4 reader 
-*
-*  @version 1.0.0
-* 
-*  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
-*
-*  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.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
+ *
+ *  @brief Way Too Crude MP4 reader 
+ *
+ *  @version 1.0.0
+ * 
+ *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
+ *  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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
 
 #ifndef _GPMF_MP4READER_H
 #define _GPMF_MP4READER_H

diff --git a/demo/GPMF_print.c b/demo/GPMF_print.c
@@ -1,24 +1,24 @@
 /*! @file GPMF_print.c
-*
-*  @brief Demo to output GPMF for debugging
-*
-*  @version 1.0.2
-*
-*  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
-*
-*  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.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*
-*/
+ *
+ *  @brief Demo to output GPMF for debugging
+ *
+ *  @version 1.0.2
+ *
+ *  (C) Copyright 2017 GoPro Inc (http://gopro.com/).
+ *	
+ *  Licensed under either:
+ *  - Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0  
+ *  - MIT license, http://opensource.org/licenses/MIT
+ *  at your option.
+ *
+ *  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.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+ 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>