Skip to content

Commit

Permalink
Update license
Browse files Browse the repository at this point in the history
  • Loading branch information
Eli Schleifer authored and Eli Schleifer committed Jul 30, 2014
1 parent 7ff00a4 commit 00db966
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 7 deletions.
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (c) 2013 Olivier Poitrey <[email protected]>

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.

10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
SDAVAssetExportSession
# SDAVAssetExportSession
======================

`AVAssetExportSession` drop-in remplacement with customizable audio&amp;video settings.

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
Expand Down Expand Up @@ -48,4 +48,8 @@ encoder.audioSettings = @
}
}];

```
```
## Licenses
All source code is licensed under the [MIT-License](https://github.com/rs/SDAVAssetExportSession/blob/master/LICENSE).
9 changes: 7 additions & 2 deletions SDAVAssetExportSession.h
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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 <Foundation/Foundation.h>
Expand Down
10 changes: 8 additions & 2 deletions SDAVAssetExportSession.m
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> 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"

Expand Down

0 comments on commit 00db966

Please sign in to comment.