scp-fs2open/fs2open.github.com
1
0 Fork 0
mirror of https://github.com/scp-fs2open/fs2open.github.com.git synced 2026-11-07 08:15:59 -10:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix avcodec deprecation warnings

Browse Source
This commit is contained in:
Taylor Richards committed 2025-08-18 12:01:00 -04:00
1 parent d9b7710f92
commit af833f059c
2 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/cutscene/ffmpeg/internal.cpp
+6 -3
View File
@@ -12,9 +12,10 @@ DecoderStatus::~DecoderStatus() {
videoCodec = nullptr;
if (videoCodecCtx != nullptr) {
avcodec_close(videoCodecCtx);
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
avcodec_free_context(&videoCodecCtx);
#else
avcodec_close(videoCodecCtx);
#endif
videoCodecCtx = nullptr;
}
@@ -24,9 +25,10 @@ DecoderStatus::~DecoderStatus() {
audioCodec = nullptr;
if (audioCodecCtx != nullptr) {
avcodec_close(audioCodecCtx);
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
avcodec_free_context(&audioCodecCtx);
#else
avcodec_close(audioCodecCtx);
#endif
audioCodecCtx = nullptr;
}
@@ -36,9 +38,10 @@ DecoderStatus::~DecoderStatus() {
subtitleCodec = nullptr;
if (subtitleCodecCtx != nullptr) {
avcodec_close(subtitleCodecCtx);
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
avcodec_free_context(&subtitleCodecCtx);
#else
avcodec_close(subtitleCodecCtx);
#endif
subtitleCodecCtx = nullptr;
}
code/sound/ffmpeg/FFmpegWaveFile.cpp
+2 -1
View File
@@ -151,9 +151,10 @@ FFmpegWaveFile::~FFmpegWaveFile()
av_frame_free(&m_decodeFrame);
if (m_audioCodecCtx) {
avcodec_close(m_audioCodecCtx);
#if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(57, 24, 255)
avcodec_free_context(&m_audioCodecCtx);
#else
avcodec_close(m_audioCodecCtx);
#endif
m_audioCodecCtx = nullptr;
}