From b37641f9ab7ba662ddbd99c28b4b42dce98c1787 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Wed, 31 Oct 2012 00:08:06 +0100
Subject: [PATCH 1/2] Add branch-alias

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 825ebad..bb334e0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,6 @@
 {
     "name": "php-ffmpeg/php-ffmpeg",
     "type": "library",
-    "version": "0.1.0",
     "description": "FFMpeg PHP, an Object Oriented library to communicate with AVconv / ffmpeg",
     "keywords": ["video processing", "video", "audio processing", "audio", "avconv", "ffmpeg", "avprobe", "ffprobe"],
     "license": "MIT",
@@ -35,5 +34,10 @@
         "psr-0": {
             "FFMpeg": "src"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "0.1.x-dev"
+        }
     }
 }

From 333de82f09b7b83e88e367abc1036cca47c93a87 Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Thu, 7 Feb 2013 12:08:51 +0100
Subject: [PATCH 2/2] Remove incompatible options of FFMpeg 1.1

---
 src/FFMpeg/FFMpeg.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/FFMpeg/FFMpeg.php b/src/FFMpeg/FFMpeg.php
index 167b05f..e884cac 100644
--- a/src/FFMpeg/FFMpeg.php
+++ b/src/FFMpeg/FFMpeg.php
@@ -315,7 +315,6 @@ class FFMpeg extends Binary
             ->add('-refs')->add('6')->add('-coder')->add('1')->add('-qmin')
             ->add('10')->add('-qmax')->add('51')
             ->add('-sc_threshold')->add('40')->add('-flags')->add('+loop')
-            ->add('-cmp')->add('+chroma')
             ->add('-me_range')->add('16')->add('-subq')->add('7')
             ->add('-i_qfactor')->add('0.71')->add('-qcomp')->add('0.6')
             ->add('-qdiff')->add('4')