From cb4b17f617e998fb64cf20e13bd05b5f31f240ce Mon Sep 17 00:00:00 2001
From: Tim Redfern <tim@eclectronics.org>
Date: Thu, 19 Sep 2013 13:25:51 +0100
Subject: reduce bit rate

---
 rotord/src/libavwrapper.h | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'rotord/src/libavwrapper.h')

diff --git a/rotord/src/libavwrapper.h b/rotord/src/libavwrapper.h
index 8ce22eb..77832a7 100644
--- a/rotord/src/libavwrapper.h
+++ b/rotord/src/libavwrapper.h
@@ -14,13 +14,6 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 #include <libavutil/opt.h>
 #include <libswscale/swscale.h>
-<<<<<<< HEAD
-    // ?????????
-//#include <libavformat/movenc.h>
-=======
-    //?????????
-    //#include <libavformat/movenc.h>
->>>>>>> e8bfadcde7063ebaac5c8121747109dd574abf61
 }
 
 #include <string>
-- 
cgit v1.2.3