[float / sample] minor build fix

ossia · Jan 24, 2024 · 488c549 · 488c549
1 parent 07dabd4
commit 488c549
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/plugins/score-plugin-gfx/Gfx/Libav/LibavEncoder.cpp b/src/plugins/score-plugin-gfx/Gfx/Libav/LibavEncoder.cpp
@@ -88,7 +88,7 @@ int LibavEncoder::start()
     ret = avio_open(&m_formatContext->pb, filename.c_str(), AVIO_FLAG_WRITE);
     if(ret < 0)
     {
-      qDebug() << "Could not open" << filename.c_str() << ":" << av_err2str(ret));
+      qDebug() << "Could not open" << filename.c_str() << ":" << av_to_string(ret));
       avformat_free_context(m_formatContext);
       m_formatContext = nullptr;
       return 1;

diff --git a/src/plugins/score-plugin-gfx/Gfx/Libav/LibavOutputStream.hpp b/src/plugins/score-plugin-gfx/Gfx/Libav/LibavOutputStream.hpp
@@ -198,6 +198,7 @@ struct OutputStream
       const LibavOutputSettings& set, AVFormatContext* oc, const AVCodec* codec,
       AVDictionary* opt_arg)
   {
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 24, 100)
     AVDictionary* opt = nullptr;
 
     av_dict_copy(&opt, opt_arg, 0);
@@ -222,6 +223,7 @@ struct OutputStream
       nb_samples = enc->frame_size;
       qDebug() << "Forcing frame_size: " << nb_samples;
     }
+
     cache_input_frame = alloc_audio_frame(
         enc->sample_fmt, &enc->ch_layout, enc->sample_rate, nb_samples);
 
@@ -285,8 +287,10 @@ struct OutputStream
           break;
       }
     }
+#endif
   }
 
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 24, 100)
   static AVFrame* alloc_audio_frame(
       enum AVSampleFormat sample_fmt, const AVChannelLayout* channel_layout,
       int sample_rate, int nb_samples)
@@ -315,6 +319,7 @@ struct OutputStream
 
     return frame;
   }
+#endif
 
   static AVFrame* alloc_video_frame(enum AVPixelFormat pix_fmt, int width, int height)
   {

diff --git a/src/plugins/score-plugin-media/Media/Libav.hpp b/src/plugins/score-plugin-media/Media/Libav.hpp
@@ -13,7 +13,7 @@ extern "C" int av_strerror(int errnum, char* errbuf, size_t errbuf_size);
 
 static inline QString av_to_string(int errnum)
 {
-  thread_local char err[512];
+  char err[512];
   av_strerror(errnum, err, 512);
   return QString::fromUtf8(err);
 }