mirror of
https://github.com/termux/termux-packages.git
synced 2025-01-31 21:22:27 +00:00
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
Copied from https://salsa.debian.org/multimedia-team/vlc/-/commit/f0ead348a0d2739c6e097938e7fd20db39c6fc59
|
|
|
|
From: =?utf-8?q?Fran=C3=A7ois_Cartegnie?= <fcvlcdev@free.fr>
|
|
Date: Tue, 23 Apr 2024 13:14:53 +0700
|
|
Subject: demux/mux: avformat: use ch_layout from ffmpeg 5.1
|
|
|
|
merger pick from commit a55ec32ab3760d9edb6f05481cd3a981aa42878d
|
|
and fixup 195f0c98599b55950c49a62f98d9d3495be310df
|
|
---
|
|
modules/demux/avformat/demux.c | 4 ++++
|
|
modules/demux/avformat/mux.c | 4 ++++
|
|
2 files changed, 8 insertions(+)
|
|
|
|
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
|
|
index 3b355bb..830dc01 100644
|
|
--- a/modules/demux/avformat/demux.c
|
|
+++ b/modules/demux/avformat/demux.c
|
|
@@ -401,7 +401,11 @@ int avformat_OpenDemux( vlc_object_t *p_this )
|
|
es_format_Init( &es_fmt, AUDIO_ES, fcc );
|
|
es_fmt.i_original_fourcc = CodecTagToFourcc( cp->codec_tag );
|
|
es_fmt.i_bitrate = cp->bit_rate;
|
|
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 59, 24, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
|
|
+ es_fmt.audio.i_channels = cp->ch_layout.nb_channels;
|
|
+#else
|
|
es_fmt.audio.i_channels = cp->channels;
|
|
+#endif
|
|
es_fmt.audio.i_rate = cp->sample_rate;
|
|
es_fmt.audio.i_bitspersample = cp->bits_per_coded_sample;
|
|
es_fmt.audio.i_blockalign = cp->block_align;
|
|
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
|
|
index c708276..8bf8735 100644
|
|
--- a/modules/demux/avformat/mux.c
|
|
+++ b/modules/demux/avformat/mux.c
|
|
@@ -267,7 +267,11 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
|
|
{
|
|
case AUDIO_ES:
|
|
codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
|
|
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 59, 24, 100 ) && LIBAVCODEC_VERSION_MICRO >= 100
|
|
+ av_channel_layout_default( &codecpar->ch_layout, fmt->audio.i_channels );
|
|
+#else
|
|
codecpar->channels = fmt->audio.i_channels;
|
|
+#endif
|
|
codecpar->sample_rate = fmt->audio.i_rate;
|
|
stream->time_base = (AVRational){1, codecpar->sample_rate};
|
|
if (fmt->i_bitrate == 0) {
|