diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-07-01 09:56:07 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-07-03 22:48:26 +0200 |
| commit | b42699ccbf7865fc84b8c6218c070a1f06d2703a (patch) | |
| tree | 15ccbefbdbab873b33d7f9f0dbf1a1bfe6e868e4 | |
| parent | 5555e580ecbfe6612ac5d18391fc0f6f96b96ac5 (diff) | |
Fix deprecated FFmpeg stuff.
| -rw-r--r-- | src/lib/audio_filter_graph.cc | 3 | ||||
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/lib/audio_filter_graph.cc b/src/lib/audio_filter_graph.cc index cb888c162..55a26cdb2 100644 --- a/src/lib/audio_filter_graph.cc +++ b/src/lib/audio_filter_graph.cc @@ -142,9 +142,6 @@ AudioFilterGraph::process (shared_ptr<AudioBuffers> buffers) _in_frame->format = AV_SAMPLE_FMT_FLTP; _in_frame->sample_rate = _sample_rate; _in_frame->ch_layout = _channel_layout; -LIBDCP_DISABLE_WARNINGS - _in_frame->channels = process_channels; -LIBDCP_ENABLE_WARNINGS int r = av_buffersrc_write_frame (_buffer_src_context, _in_frame); diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index dfc0205ac..147e83a65 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -95,7 +95,7 @@ public: ~ExportAudioStream () { - avcodec_close (_codec_context); + avcodec_free_context(&_codec_context); } ExportAudioStream (ExportAudioStream const&) = delete; @@ -285,7 +285,7 @@ FFmpegFileEncoder::FFmpegFileEncoder ( FFmpegFileEncoder::~FFmpegFileEncoder () { _audio_streams.clear (); - avcodec_close (_video_codec_context); + avcodec_free_context(&_video_codec_context); avio_close (_format_context->pb); _format_context->pb = nullptr; avformat_free_context (_format_context); |