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

Merge branch 'remove-libav-deprecation'

This commit is contained in:
Glenn Rice 2012-08-28 22:46:43 -05:00
parent 94e49c5044 054c6f2aad
commit c1a684bd44
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeTests/CheckLib.cmake
View File

@ -55,8 +55,8 @@ endmacro()
macro(check_libav) macro(check_libav)
if(PKG_CONFIG_FOUND) if(PKG_CONFIG_FOUND)
pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0 pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0
libswscale>=2.0.0 libavutil>=51.7.0) libswscale>=2.1.0 libavutil>=51.22.1)
else() else()
message("pkg-config is required to check for libav") message("pkg-config is required to check for libav")
endif() endif()

4
Source/Core/VideoCommon/Src/AVIDump.cpp
View File

@ -252,7 +252,7 @@ bool AVIDump::CreateFile()
File::CreateFullPath(s_FormatContext->filename); File::CreateFullPath(s_FormatContext->filename);
if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) || if (!(s_FormatContext->oformat = av_guess_format("avi", NULL, NULL)) ||
!(s_Stream = av_new_stream(s_FormatContext, 0))) !(s_Stream = avformat_new_stream(s_FormatContext, codec)))
{ {
CloseFile(); CloseFile();
return false; return false;
@ -269,7 +269,7 @@ bool AVIDump::CreateFile()
s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P; s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;
if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) || if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) ||
(avcodec_open(s_Stream->codec, codec) < 0)) (avcodec_open2(s_Stream->codec, codec, NULL) < 0))
{ {
CloseFile(); CloseFile();
return false; return false;