Yet more fixes for old ffmpeg.

[c64tapwav] / audioreader.cpp

diff --git a/audioreader.cpp b/audioreader.cpp
index 68243ca29da28f484f9c3671231914c997fbbfb6..6a9c5cf6d644661b6ab3a99727cafaff587587aa 100644 (file)
--- a/audioreader.cpp
+++ b/audioreader.cpp
@@ -2,11 +2,12 @@
 
 extern "C" {
 
+#define __STDC_CONSTANT_MACROS
+
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswresample/swresample.h>
 #include <libavutil/avutil.h>
-#include <libavutil/frame.h>
 
 }
 
@@ -24,7 +25,8 @@ struct AVFormatCloserAndDeleter {
 
 struct AVCodecContextDeleter {
        void operator() (AVCodecContext *ctx) {
-               avcodec_free_context(&ctx);
+               avcodec_close(ctx);
+               av_freep(&ctx);
        }
 };
 
@@ -153,8 +155,13 @@ bool read_audio_file(const char *filename, std::vector<float> *samples, int *sam
        }
 
        AVPacket packet;
-       AVFrame* audio_frame = av_frame_alloc();
+#if (LIBAVCODEC_VERSION_MAJOR >= 55)
+       AVFrame *audio_frame = av_frame_alloc();
        std::unique_ptr<AVFrame, AVFrameDeleter> audio_frame_deleter(audio_frame);
+#else
+       AVFrame frame_holder {};
+       AVFrame *audio_frame = &frame_holder;
+#endif
        while (av_read_frame(format_ctx, &packet) >= 0) {
                std::unique_ptr<AVPacket, AVPacketDeleter> av_packet_deleter(&packet);