Move to FFmpeg 4.0 APIs, fixing the deprecation warnings.

[nageru] / nageru / ffmpeg_capture.h

diff --git a/nageru/ffmpeg_capture.h b/nageru/ffmpeg_capture.h
index b0a1be2d542ce3b231bb4efe1263f43793c8b424..468c213d17f677a9235242a5d9f7b1bcecdeaba3 100644 (file)
--- a/nageru/ffmpeg_capture.h
+++ b/nageru/ffmpeg_capture.h
@@ -31,7 +31,7 @@
 #include <movit/ycbcr.h>
 
 extern "C" {
-#include <libavresample/avresample.h>
+#include <libswresample/swresample.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
@@ -271,7 +271,7 @@ private:
        std::vector<QueuedCommand> command_queue;  // Protected by <queue_mu>.
 
        // Audio resampler.
-       AVAudioResampleContext *resampler = nullptr;
+       SwrContext *resampler = nullptr;
        AVSampleFormat last_src_format, last_dst_format;
        int64_t last_channel_layout;
        int last_sample_rate;