1 files changed, 16 insertions, 1 deletions
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp
index 13e151c..65bbeb5 100644
--- a/rotord/src/libavwrapper.cpp
+++ b/rotord/src/libavwrapper.cpp
@@ -195,6 +195,13 @@ bool libav::exporter::record(std::string filename){
         }
     }
 
+<<<<<<< HEAD
+    AVDictionary *opts = NULL; // "create" an empty dictionary
+
+
+    // Write the stream header, if any. //
+    int ret = avformat_write_header(oc, &opts);
+=======
         ///
         /// trying to change the moov atom 170913
 
@@ -208,10 +215,18 @@ bool libav::exporter::record(std::string filename){
 
     // Write the stream header, if any. //
     int ret = avformat_write_header(oc, NULL); //&options); //
+>>>>>>> e8bfadcde7063ebaac5c8121747109dd574abf61
     if (ret < 0) {
-        //std::cerr <<"Error occurred when opening output file:" << av_err2str(ret) << std::endl;
+        std::cerr <<"Error occurred when opening output file:" <<endl; // av_err2str(ret) << std::endl;
         return false;
     }
+    //#include <libavformat/movenc.h>
+    //mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov, AVFormatContext *s)
+    /*ret = mov_write_moov_tag(oc, NULL,NULL);
+     if (ret < 0) {
+        std::cerr <<"Error occurred when writing moov atom " <<endl; // << av_err2str(ret) << std::endl;
+        return false;
+    }*/
 
     if (frame)
         frame->pts = 0;