diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-09-19 13:25:51 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-09-19 13:25:51 +0100 |
| commit | cb4b17f617e998fb64cf20e13bd05b5f31f240ce (patch) | |
| tree | f9eb2bb15e9d8f207b1512b4da37da7ac991fd52 /rotord/src/libavwrapper.h | |
| parent | b57c742e2df5c8f495a3b4dbf4a9e56a4aab9f7e (diff) | |
reduce bit rate
Diffstat (limited to 'rotord/src/libavwrapper.h')
| -rw-r--r-- | rotord/src/libavwrapper.h | 7 |
1 files changed, 0 insertions, 7 deletions
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> |