diff options
Diffstat (limited to 'rotord/src/libavwrapper.cpp')
| -rw-r--r-- | rotord/src/libavwrapper.cpp | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/rotord/src/libavwrapper.cpp b/rotord/src/libavwrapper.cpp index d4f35ee..65bbeb5 100644 --- a/rotord/src/libavwrapper.cpp +++ b/rotord/src/libavwrapper.cpp @@ -195,11 +195,27 @@ 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 + + //MOVMuxContext *mov = oc->priv_data; + //mov->flags |= FF_MOV_FLAG_FRAGMENT; + //AVDictionary* options; + //av_dict_set(&options, "vprofile", "baseline", 0); + + /// + /// + + // 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:" <<endl; // av_err2str(ret) << std::endl; return false; @@ -361,6 +377,7 @@ AVStream* libav::exporter::add_stream(AVFormatContext *oc, AVCodec **codec,enum // * the motion of the chroma plane does not match the luma plane. // c->mb_decision = 2; } + break; default: @@ -381,7 +398,7 @@ void libav::exporter::open_video(AVFormatContext *oc, AVCodec *codec, AVStream * // open the codec // mutex.lock(); - ret = avcodec_open2(c, codec, NULL); + ret = avcodec_open2(c, codec, NULL); //OPTIONS CAN GO HERE mutex.unlock(); if (ret < 0) { //fprintf(stderr, "Could not open video codec: %s\n", av_err2str(ret)); @@ -415,6 +432,8 @@ void libav::exporter::open_video(AVFormatContext *oc, AVCodec *codec, AVStream * } } + + // copy data and linesize picture pointers to frame // *((AVPicture *)frame) = dst_picture; |