diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-09-30 22:46:33 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-11-29 21:19:55 +0100 |
| commit | 563399e3c00b3548af9ab1728d28aa0a329f826a (patch) | |
| tree | 72e22341355a9bdce33ecc3a3636e9db2949c4c2 /src/lib/ffmpeg_file_encoder.cc | |
| parent | a4f70ad900909dc5c8fe5cdd8e65c28243d932c1 (diff) | |
Bump ffmpeg to 5.1.2 "Riemann"
Diffstat (limited to 'src/lib/ffmpeg_file_encoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_file_encoder.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_file_encoder.cc b/src/lib/ffmpeg_file_encoder.cc index 6d1ad68f7..d7833265d 100644 --- a/src/lib/ffmpeg_file_encoder.cc +++ b/src/lib/ffmpeg_file_encoder.cc @@ -73,8 +73,7 @@ public: _codec_context->bit_rate = channels * 128 * 1024; _codec_context->sample_fmt = sample_format; _codec_context->sample_rate = frame_rate; - _codec_context->channel_layout = av_get_default_channel_layout (channels); - _codec_context->channels = channels; + av_channel_layout_default(&_codec_context->ch_layout, channels); int r = avcodec_open2 (_codec_context, _codec, 0); if (r < 0) { @@ -143,7 +142,7 @@ public: frame->nb_samples = size; frame->format = _codec_context->sample_fmt; - frame->channels = channels; + frame->ch_layout.nb_channels = channels; int r = avcodec_fill_audio_frame (frame, channels, _codec_context->sample_fmt, (const uint8_t *) samples, buffer_size, 0); DCPOMATIC_ASSERT (r >= 0); |