Commitefe374d

Michael Christopher

committed

Updated licenses

1 parent93510cc commitefe374dCopy full SHA for efe374d

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,13 +5,16 @@ Author: [Michael Christopher] (m (a) zencoder (.) com)`
`5`	`5`	`Company:[Zencoder - Online Video Encoder](http://www.zencoder.com)`
`6`	`6`	`Version: 2.0`
`7`	`7`	`Date: 2012-01-02`
`8`		`-Repository:<http://github.com/zencoder/zencoder-php/>`
	`8`	`+Repository:<http://github.com/zencoder/zencoder-php/>`
`9`	`9`
`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`
`11`	`13`	`<http://app.zencoder.com/docs/api>`
`12`	`14`
`13`	`15`	`To start working with the library, create a new instance of the Services_Zencoder class, passing`
`14`	`16`	`your API Key as the 1st parameter.`
	`17`	`+`
`15`	`18`	`$zencoder = new Services_Zencoder('93h630j1dsyshjef620qlkavnmzui3');`
`16`	`19`
`17`	`20`	`Once you have created the object, you can use it to interact with the API. For full information,`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,20 @@`
`13`	`13`	`class Services_Zencoder_HttpExceptionextends Services_Zencoder_Exception {}`
`14`	`14`
`15`	`15`	`/**`
`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.`
`17`	`30`	`*`
`18`	`31`	`* @category Services`
`19`	`32`	`* @package Services_Zencoder`

Comments

(0)