ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AVIDump: open codec before stream 

Minor oversight in the existing code.
This commit is contained in:
Michael Maltese 2017-01-03 15:50:17 -08:00
parent dd3d8c7a4e
commit 867d6134c5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,14 +106,19 @@ bool AVIDump::CreateVideoFile()
} }
} }
if (!(s_format_context->oformat = av_guess_format("avi", nullptr, nullptr)) || if (!(s_format_context->oformat = av_guess_format("avi", nullptr, nullptr)))
{
return false;
}
AVCodecID codec_id =
g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1 : s_format_context->oformat->video_codec;
if (!(codec = avcodec_find_encoder(codec_id)) ||
!(s_stream = avformat_new_stream(s_format_context, codec))) !(s_stream = avformat_new_stream(s_format_context, codec)))
{ {
return false; return false;
} }
s_stream->codec->codec_id =
g_Config.bUseFFV1 ? AV_CODEC_ID_FFV1 : s_format_context->oformat->video_codec;
if (!g_Config.bUseFFV1) if (!g_Config.bUseFFV1)
s_stream->codec->codec_tag = s_stream->codec->codec_tag =
MKTAG('X', 'V', 'I', 'D'); // Force XVID FourCC for better compatibility MKTAG('X', 'V', 'I', 'D'); // Force XVID FourCC for better compatibility
@ -126,8 +131,7 @@ bool AVIDump::CreateVideoFile()
s_stream->codec->gop_size = 12; s_stream->codec->gop_size = 12;
s_stream->codec->pix_fmt = g_Config.bUseFFV1 ? AV_PIX_FMT_BGRA : AV_PIX_FMT_YUV420P; s_stream->codec->pix_fmt = g_Config.bUseFFV1 ? AV_PIX_FMT_BGRA : AV_PIX_FMT_YUV420P;
if (!(codec = avcodec_find_encoder(s_stream->codec->codec_id)) || if (avcodec_open2(s_stream->codec, codec, nullptr) < 0)
(avcodec_open2(s_stream->codec, codec, nullptr) < 0))
{ {
return false; return false;
} }