diff options
Diffstat (limited to 'rotord/src/libavwrapper.h')
| -rw-r--r-- | rotord/src/libavwrapper.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/rotord/src/libavwrapper.h b/rotord/src/libavwrapper.h index 35cb149..8ce22eb 100644 --- a/rotord/src/libavwrapper.h +++ b/rotord/src/libavwrapper.h @@ -14,8 +14,13 @@ 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> |