From e45698aaa0f99eff1700089954a5af55b53ec47b Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 14 Jul 2018 12:30:40 -0700 Subject: [PATCH 1/2] AVIDump: av_register_all is deprecated/unneeded since 58.9.100 --- Source/Core/VideoCommon/AVIDump.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index 71540d8bfb..b6d51fc718 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -58,7 +58,9 @@ static void InitAVCodec() static bool first_run = true; if (first_run) { +#if LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100) av_register_all(); +#endif avformat_network_init(); first_run = false; } From 857138a0ba051152529b8695fe775924c857f908 Mon Sep 17 00:00:00 2001 From: Michael M Date: Sat, 14 Jul 2018 12:43:00 -0700 Subject: [PATCH 2/2] AVIDump: use dump_path rather than deprecated AVFormatContext::filename AVFormatContext::filename was deprecated in lavf 58.7.100 in favor of AVFormatContext::url. Instead of adding version-checking logic, just use the passed-in dump path instead. --- Source/Core/VideoCommon/AVIDump.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/VideoCommon/AVIDump.cpp b/Source/Core/VideoCommon/AVIDump.cpp index b6d51fc718..b8cdf1ca1c 100644 --- a/Source/Core/VideoCommon/AVIDump.cpp +++ b/Source/Core/VideoCommon/AVIDump.cpp @@ -224,16 +224,16 @@ bool AVIDump::CreateVideoFile() return false; } - NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_format_context->filename); - if (avio_open(&s_format_context->pb, s_format_context->filename, AVIO_FLAG_WRITE) < 0 || + NOTICE_LOG(VIDEO, "Opening file %s for dumping", dump_path.c_str()); + if (avio_open(&s_format_context->pb, dump_path.c_str(), AVIO_FLAG_WRITE) < 0 || avformat_write_header(s_format_context, nullptr)) { - ERROR_LOG(VIDEO, "Could not open %s", s_format_context->filename); + ERROR_LOG(VIDEO, "Could not open %s", dump_path.c_str()); return false; } - OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", s_format_context->filename, - s_width, s_height)); + OSD::AddMessage( + StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", dump_path.c_str(), s_width, s_height)); return true; }