From 00db9663bc2da0234690d43832bf86ff5656b7e7 Mon Sep 17 00:00:00 2001 From: Eli Schleifer Date: Wed, 30 Jul 2014 10:55:20 -0400 Subject: [PATCH] Update license --- LICENSE | 19 +++++++++++++++++++ README.md | 10 +++++++--- SDAVAssetExportSession.h | 9 +++++++-- SDAVAssetExportSession.m | 10 ++++++++-- 4 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..7ee23d3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) 2013 Olivier Poitrey + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + diff --git a/README.md b/README.md index 5282588..a784078 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -SDAVAssetExportSession +# SDAVAssetExportSession ====================== `AVAssetExportSession` drop-in remplacement with customizable audio&video settings. @@ -6,7 +6,7 @@ SDAVAssetExportSession You want the ease of use of `AVAssetExportSession` but default provided presets doesn't fit your needs? You then began to read documentation for `AVAssetWriter`, `AVAssetWriterInput`, `AVAssetReader`, `AVAssetReaderVideoCompositionOutput`, `AVAssetReaderAudioMixOutput`… and you went out of aspirin? `SDAVAssetExportSession` is a rewrite of `AVAssetExportSession` on top of `AVAssetReader*` and `AVAssetWriter*`. Unlike `AVAssetExportSession`, you are not limited to a set of presets – you have full access over audio and video settings. -Usage Example +## Usage Example ------------- ``` objective-c @@ -48,4 +48,8 @@ encoder.audioSettings = @ } }]; -``` \ No newline at end of file +``` + +## Licenses + +All source code is licensed under the [MIT-License](https://github.com/rs/SDAVAssetExportSession/blob/master/LICENSE). \ No newline at end of file diff --git a/SDAVAssetExportSession.h b/SDAVAssetExportSession.h index 3b4e862..eb3d81d 100644 --- a/SDAVAssetExportSession.h +++ b/SDAVAssetExportSession.h @@ -1,8 +1,13 @@ // // SDAVAssetExportSession.h // -// Created by Olivier Poitrey on 13/03/13. -// Copyright (c) 2013 Dailymotion. All rights reserved. +// This file is part of the SDAVAssetExportSession package. +// +// Created by Olivier Poitrey on 13/03/13. +// Copyright 2013 Olivier Poitrey. All rights servered. +// +// For the full copyright and license information, please view the LICENSE +// file that was distributed with this source code. // #import diff --git a/SDAVAssetExportSession.m b/SDAVAssetExportSession.m index f5d1376..fb151ad 100644 --- a/SDAVAssetExportSession.m +++ b/SDAVAssetExportSession.m @@ -1,9 +1,15 @@ // // SDAVAssetExportSession.m // -// Created by Olivier Poitrey on 13/03/13. -// Copyright (c) 2013 Dailymotion. All rights reserved. +// This file is part of the SDAVAssetExportSession package. // +// Created by Olivier Poitrey on 13/03/13. +// Copyright 2013 Olivier Poitrey. All rights servered. +// +// For the full copyright and license information, please view the LICENSE +// file that was distributed with this source code. +// + #import "SDAVAssetExportSession.h"