The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-03-12 22:56:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7264 from ligfx/ffmpeg_deprecations

Browse Source 
Fix deprecation warnings with recent FFmpeg versions
This commit is contained in:
Mat M 2018-07-16 23:44:18 -04:00 committed by GitHub
commit 944b5fade6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoCommon/AVIDump.cpp
View File

@ -58,7 +58,9 @@ static void InitAVCodec()
static bool first_run = true; static bool first_run = true;
if (first_run) if (first_run)
{ {
#if LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 9, 100)
av_register_all(); av_register_all();
#endif
avformat_network_init(); avformat_network_init();
first_run = false; first_run = false;
} }
@ -222,16 +224,16 @@ bool AVIDump::CreateVideoFile()
return false; return false;
} }
NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_format_context->filename); NOTICE_LOG(VIDEO, "Opening file %s for dumping", dump_path.c_str());
if (avio_open(&s_format_context->pb, s_format_context->filename, AVIO_FLAG_WRITE) < 0 || if (avio_open(&s_format_context->pb, dump_path.c_str(), AVIO_FLAG_WRITE) < 0 ||
avformat_write_header(s_format_context, nullptr)) 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; return false;
} }
OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", s_format_context->filename, OSD::AddMessage(
s_width, s_height)); StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", dump_path.c_str(), s_width, s_height));
return true; return true;
} }