diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-09-18 12:44:46 +0100 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-09-18 12:44:46 +0100 |
| commit | b57c742e2df5c8f495a3b4dbf4a9e56a4aab9f7e (patch) | |
| tree | 7a339316d9877254773e0aa650e9a92f65adfb27 /rotord/src/libavwrapper.h | |
| parent | ef032276fc0e202b8c54dc6239bac418ffdc4c70 (diff) | |
| parent | e8bfadcde7063ebaac5c8121747109dd574abf61 (diff) | |
trying avformat_write_header options in exporter
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 989d045..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> |