This commit is contained in:
grosroro 2012-05-31 16:16:35 +02:00
commit 44e6eb6f79
7 changed files with 20 additions and 21 deletions

View file

@ -117,7 +117,7 @@ class FFMpeg extends Binary
try { try {
$process->run(); $process->run();
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
} }
if ( ! $process->isSuccessful()) { if ( ! $process->isSuccessful()) {
@ -198,7 +198,7 @@ class FFMpeg extends Binary
try { try {
$process->run(); $process->run();
} catch (\RuntimeException $e) { } catch (\RuntimeException $e) {
} }
if ( ! $process->isSuccessful()) { if ( ! $process->isSuccessful()) {

View file

@ -26,9 +26,9 @@ class FFProbe extends Binary
/** /**
* Probe the format of a given file * Probe the format of a given file
* *
* @param string $pathfile * @param string $pathfile
* @return string A Json object containing the key/values of the probe output * @return string A Json object containing the key/values of the probe output
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws RuntimeException * @throws RuntimeException
*/ */
@ -72,9 +72,9 @@ class FFProbe extends Binary
/** /**
* Probe the streams contained in a given file * Probe the streams contained in a given file
* *
* @param string $pathfile * @param string $pathfile
* @return array An array of streams array * @return array An array of streams array
* *
* @throws InvalidArgumentException * @throws InvalidArgumentException
* @throws RuntimeException * @throws RuntimeException
*/ */

View file

@ -25,11 +25,11 @@ interface Audio
* @return integer * @return integer
*/ */
public function getKiloBitrate(); public function getKiloBitrate();
/** /**
* Give som extra parameters to add to ffmpeg commandline * Give som extra parameters to add to ffmpeg commandline
* Parameters MUST be escaped * Parameters MUST be escaped
* *
* @return string * @return string
*/ */
public function getExtraParams(); public function getExtraParams();

View file

@ -15,7 +15,7 @@ use FFMpeg\Exception\InvalidArgumentException;
/** /**
* Dimension object, used for manipulating width and height couples * Dimension object, used for manipulating width and height couples
* *
* @author Romain Neutron imprec@gmail.com * @author Romain Neutron imprec@gmail.com
*/ */
class Dimension class Dimension
@ -25,9 +25,9 @@ class Dimension
/** /**
* Constructor * Constructor
* *
* @param integer $width * @param integer $width
* @param integer $height * @param integer $height
* @throws InvalidArgumentException when one of the parameteres is invalid * @throws InvalidArgumentException when one of the parameteres is invalid
*/ */
public function __construct($width, $height) public function __construct($width, $height)
@ -42,7 +42,7 @@ class Dimension
/** /**
* Return width * Return width
* *
* @return width * @return width
*/ */
public function getWidth() public function getWidth()
@ -52,7 +52,7 @@ class Dimension
/** /**
* Return height * Return height
* *
* @return integer * @return integer
*/ */
public function getHeight() public function getHeight()

View file

@ -18,5 +18,5 @@ namespace FFMpeg\Format;
*/ */
interface Video extends Audio interface Video extends Audio
{ {
} }

View file

@ -28,9 +28,9 @@ interface Resizable extends BaseVideo
* Returns the computed dimensions for the resize, after operation. * Returns the computed dimensions for the resize, after operation.
* This method return the actual dimensions that FFmpeg will use. * This method return the actual dimensions that FFmpeg will use.
* *
* @param integer $originalWidth * @param integer $originalWidth
* @param integer $originalHeight * @param integer $originalHeight
* @return Dimension A dimension * @return Dimension A dimension
*/ */
public function getComputedDimensions($originalWidth, $originalHeight); public function getComputedDimensions($originalWidth, $originalHeight);
} }

View file

@ -12,7 +12,6 @@
namespace FFMpeg\Format\Video; namespace FFMpeg\Format\Video;
use FFMpeg\Format\Video as BaseVideo; use FFMpeg\Format\Video as BaseVideo;
use FFMpeg\Format\Dimension;
/** /**
* @author Romain Neutron imprec@gmail.com * @author Romain Neutron imprec@gmail.com