RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

psxstr: convert to new channel layout API 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 18:10:23 +02:00 committed by James Almer
parent 0b07a53170
commit 67fb6c2200
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/psxstr.c
View File

@ -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;
}