openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into std-prefixes

Browse Source
This commit is contained in:
FeRD (Frank Dana)
2019-08-17 16:07:24 -04:00
parent 066e2558ee 1cdddba020
commit 05a53784cb
9 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/FFmpegWriter.cpp
View File

@@ -525,9 +525,7 @@ void FFmpegWriter::WriteHeader() {
}
// Force the output filename (which doesn't always happen for some reason)
snprintf(oc->AV_FILENAME, sizeof(oc->AV_FILENAME), "%s", path.c_str());
// Write the stream header, if any
AV_SET_FILENAME(oc, path.c_str());
// Add general metadata (if any)
for (std::map<std::string, std::string>::iterator iter = info.metadata.begin(); iter != info.metadata.end(); ++iter) {
@@ -543,6 +541,7 @@ void FFmpegWriter::WriteHeader() {
if (is_mp4 || is_mov)
av_dict_copy(&dict, mux_dict, 0);
// Write the stream header
if (avformat_write_header(oc, &dict) != 0) {
throw InvalidFile("Could not write header to file.", path);
};
@@ -1389,7 +1388,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVStream *st) {
av_dict_set(&st->metadata, iter->first.c_str(), iter->second.c_str(), 0);
}
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_video", "video_codec->thread_count", video_codec->thread_count, "", -1, "", -1, "", -1, "", -1, "", -1);
ZmqLogger::Instance()->AppendDebugMethod("FFmpegWriter::open_video", "video_codec->thread_count", video_codec->thread_count);
}