Merge branch 'remove-libav-deprecation'

dolphin-emu · Aug 29, 2012 · c1a684b · c1a684b
2 parents 94e49c5 + 054c6f2
commit c1a684b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake
@@ -55,8 +55,8 @@ endmacro()
 
 macro(check_libav)
 	if(PKG_CONFIG_FOUND)
-		pkg_check_modules(LIBAV libavcodec>=53.5.0 libavformat>=53.2.0
-			libswscale>=2.0.0 libavutil>=51.7.0)
+		pkg_check_modules(LIBAV libavcodec>=53.35.0 libavformat>=53.21.0
+			libswscale>=2.1.0 libavutil>=51.22.1)
 	else()
 		message("pkg-config is required to check for libav")
 	endif()

diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
@@ -252,7 +252,7 @@ bool AVIDump::CreateFile()
 	File::CreateFullPath(s_FormatContext->filename);
 
 	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();
 		return false;
@@ -269,7 +269,7 @@ bool AVIDump::CreateFile()
 	s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;
 
 	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();
 		return false;