Skip to content

Commit efe374d

Browse files
author
Michael Christopher
committed
Updated licenses
1 parent 93510cc commit efe374d

File tree

2 files changed

+19
-3
lines changed

2 files changed

+19
-3
lines changed

README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ Author: [Michael Christopher] (m (a) zencoder (.) com)
55
Company: [Zencoder - Online Video Encoder](http://www.zencoder.com)
66
Version: 2.0
77
Date: 2012-01-02
8-
Repository: <http://github.com/zencoder/zencoder-php/>
8+
Repository: <http://github.com/zencoder/zencoder-php/>
99

10-
For more details on the Zencoder API requirements visit
10+
Parts of this library are based on <http://github.com/twilio/twilio-php>
11+
12+
For more details on the Zencoder API requirements visit
1113
<http://app.zencoder.com/docs/api>
1214

1315
To start working with the library, create a new instance of the Services_Zencoder class, passing
1416
your API Key as the 1st parameter.
17+
1518
$zencoder = new Services_Zencoder('93h630j1dsyshjef620qlkavnmzui3');
1619

1720
Once you have created the object, you can use it to interact with the API. For full information,

Services/Zencoder/Http.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,20 @@
1313
class Services_Zencoder_HttpException extends Services_Zencoder_Exception {}
1414

1515
/**
16-
* Zencoder API client interface.
16+
* Based on TinyHttp from https://gist.github.com/618157 and
17+
* Services_Twilio_TinyHttp from https://github.com/twilio/twilio-php/blob/master/Services/Twilio/TinyHttp.php
18+
*
19+
* Copyright 2010 Neuman Vong. All rights reserved.
20+
*
21+
* Redistribution and use in source and binary forms, with or without
22+
* modification, are permitted provided that the following conditions are met:
23+
*
24+
* 1. Redistributions of source code must retain the above copyright notice,
25+
* this list of conditions and the following disclaimer.
26+
*
27+
* 2. Redistributions in binary form must reproduce the above copyright
28+
* notice, this list of conditions and the following disclaimer in the
29+
* documentation and/or other materials provided with the distribution.
1730
*
1831
* @category Services
1932
* @package Services_Zencoder

0 commit comments

Comments
 (0)