diff options
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> |