diff options
| author | Glenn Rice <glennricster@gmail.com> | 2012-08-28 22:46:43 -0500 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2012-08-28 22:46:43 -0500 |
| commit | c1a684bd44a1da6df1ef640ea63ea20969602fb2 (patch) | |
| tree | 6e741c48fc5d53a8f5f43e37fb83d39286dd06e7 | |
| parent | 94e49c50440fa804f39b866a8923304942cef323 (diff) | |
| parent | 054c6f2aad82000b3a57852bc5e0909d56c74541 (diff) | |
Merge branch 'remove-libav-deprecation'
| -rw-r--r-- | CMakeTests/CheckLib.cmake | 4 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/Src/AVIDump.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeTests/CheckLib.cmake b/CMakeTests/CheckLib.cmake index 43f9370188..7b2525adae 100644 --- 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 index 4c31798d9f..c172903b5d 100644 --- 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; |