From: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/psxstr.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index e649ba3ab4..bb56b05688 100644
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -252,18 +252,12 @@ static int str_read_packet(AVFormatContext *s,
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_XA;
st->codecpar->codec_tag = 0; /* no fourcc */
- if (fmt & 1) {
- st->codecpar->channels = 2;
- st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
- } else {
- st->codecpar->channels = 1;
- st->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
- }
+ av_channel_layout_default(&st->codecpar->ch_layout, (fmt & 1)
+ 1);
st->codecpar->sample_rate = (fmt&4)?18900:37800;
// st->codecpar->bit_rate = 0; //FIXME;
st->codecpar->block_align = 128;
- avpriv_set_pts_info(st, 64, 18 * 224 / st->codecpar->channels,
+ avpriv_set_pts_info(st, 64, 18 * 224 /
st->codecpar->ch_layout.nb_channels,
st->codecpar->sample_rate);
st->start_time = 0;
}
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
