diff options
| author | aneejit1 <aneejit1@gmail.com> | 2022-05-20 13:12:12 +0000 |
|---|---|---|
| committer | aneejit1 <aneejit1@gmail.com> | 2022-05-20 17:04:06 +0000 |
| commit | 18ea1e7a9489bf811dd33b7652866015f6340432 (patch) | |
| tree | 6aef41779664bac030ec90d11ab447e77050893c | |
| parent | 9d90dd583d66b06d059b544e25a3ef1b8ca8f0f6 (diff) | |
| download | k3b-18ea1e7a9489bf811dd33b7652866015f6340432.tar.gz k3b-18ea1e7a9489bf811dd33b7652866015f6340432.zip | |
Fix problems for older ffmpeg versions
Fix the following issues when building against older ffmpeg versions
- the call to avcodec_free_context exceptions as avformat_close_input
already performs cleanup of the AVCodecContext, so link the calling of
avcodec_free_context in k3bffmpegwrapper.cpp to the version of
libavformat in which codecpar appeared rather than when
avcodec_free_context appeared.
- avcodec_decode_audio4 was deprecated in libavcodec 57.106.100, not
57.12.100, so the version has been corrected.
Signed-off-by: aneejit1 <aneejit1@gmail.com>
| -rw-r--r-- | plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp index 4c4496b..983c808 100644 --- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp @@ -232,7 +232,7 @@ void K3bFFMpegFile::close() { d->packetData = NULL; if (d->codec) { -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 63, 100) +#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 33, 100) ::avcodec_free_context(&d->audio_stream_ctx); #else ::avcodec_close(d->audio_stream_ctx); @@ -358,7 +358,7 @@ int K3bFFMpegFile::fillOutputBuffer() { } int gotFrame = 0; -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 12, 100) +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 106, 100) int len = avcodec_receive_frame(d->audio_stream_ctx, d->frame); if (len == 0) { gotFrame = 1; |