Emulation/Ishiiruka
1
0
Fork 0
mirror of https://github.com/Tinob/Ishiiruka.git synced 2024-05-12 17:55:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for libavformat version 59

Browse source 
Add preprocessor checks for LIBAVFORMAT_VERSION_MAJOR to fix changes in version 59: 
- AVFormatContext::filename deprecated
- av_guess_format() now returns `const AVOutputFormat*`
- av_register_all() deprecated
This commit is contained in:
iwakura 2022-06-24 18:20:18 +00:00 committed by GitHub
parent d1ffc2e339
commit 050118dfdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Source/Core/VideoCommon/AVIDump.cpp
View file

@ -30,6 +30,12 @@ extern "C" {
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoConfig.h"
#if LIBAVFORMAT_VERSION_MAJOR < 59
#define FILENAME(s) s->filename
#else
#define FILENAME(s) s->url
#endif
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
#define av_frame_alloc avcodec_alloc_frame
@ -58,7 +64,9 @@ static void InitAVCodec()
static bool first_run = true;
if (first_run)
{
#if (LIBAVFORMAT_VERSION_MAJOR < 59)
av_register_all();
#endif
avformat_network_init();
first_run = false;
}
@ -130,8 +138,12 @@ bool AVIDump::CreateVideoFile()
if (s_dump_path.empty())
return false;
#if (LIBAVFORMAT_VERSION_MAJOR < 59)
AVOutputFormat* output_format = av_guess_format(s_format.c_str(), s_dump_path.c_str(), nullptr);
#else
const AVOutputFormat* output_format = av_guess_format(s_format.c_str(), s_dump_path.c_str(), nullptr);
#endif
if (!output_format)
{
ERROR_LOG(VIDEO, "Invalid format %s", s_format.c_str());
@ -213,15 +225,15 @@ 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", FILENAME(s_format_context));
if (avio_open(&s_format_context->pb, FILENAME(s_format_context), 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", FILENAME(s_format_context));
return false;
}
OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", s_format_context->filename,
OSD::AddMessage(StringFromFormat("Dumping Frames to \"%s\" (%dx%d)", FILENAME(s_format_context),
s_width, s_height));
return true;