Fix an issue where the mixer lagging too much behind CEF would cause us to display...

[nageru] / audio_encoder.cpp

diff --git a/audio_encoder.cpp b/audio_encoder.cpp
index 578b0c2e7abec5b3597c7350d75b7cace6b8dc9a..e33d2181b46a5465a648bceead3636ba9872b535 100644 (file)
--- a/audio_encoder.cpp
+++ b/audio_encoder.cpp
@@ -5,18 +5,24 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavresample/avresample.h>
 #include <libavutil/channel_layout.h>
+#include <libavutil/error.h>
 #include <libavutil/frame.h>
+#include <libavutil/mem.h>
+#include <libavutil/opt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
-#include <libavutil/opt.h>
 }
 
 #include <assert.h>
-
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "defs.h"
+#include "mux.h"
 #include "timebase.h"
 
 using namespace std;
@@ -37,7 +43,7 @@ AudioEncoder::AudioEncoder(const string &codec_name, int bit_rate, const AVOutpu
        ctx->channel_layout = AV_CH_LAYOUT_STEREO;
        ctx->time_base = AVRational{1, TIMEBASE};
        if (oformat->flags & AVFMT_GLOBALHEADER) {
-               ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+               ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
        }
        if (avcodec_open2(ctx, codec, NULL) < 0) {
                fprintf(stderr, "Could not open codec '%s'\n", codec_name.c_str());
@@ -187,5 +193,5 @@ AVCodecParametersWithDeleter AudioEncoder::get_codec_parameters()
 {
        AVCodecParameters *codecpar = avcodec_parameters_alloc();
        avcodec_parameters_from_context(codecpar, ctx);
-       return AVCodecParametersWithDeleter(codecpar, avcodec_parameters_free_unique);
+       return AVCodecParametersWithDeleter(codecpar);
 }