mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-05 22:33:37 +00:00
swf: 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:
parent
d38166a832
commit
9ff843eb4a
@ -195,13 +195,7 @@ static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info)
|
||||
if (!ast)
|
||||
return NULL;
|
||||
ast->id = id;
|
||||
if (info & 1) {
|
||||
ast->codecpar->channels = 2;
|
||||
ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO;
|
||||
} else {
|
||||
ast->codecpar->channels = 1;
|
||||
ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO;
|
||||
}
|
||||
av_channel_layout_default(&ast->codecpar->ch_layout, 1 + (info & 1));
|
||||
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
|
||||
ast->codecpar->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15);
|
||||
ffstream(ast)->need_parsing = AVSTREAM_PARSE_FULL;
|
||||
|
@ -348,7 +348,7 @@ static int swf_write_header(AVFormatContext *s)
|
||||
return -1;
|
||||
}
|
||||
v |= 0x02; /* 16 bit playback */
|
||||
if (swf->audio_par->channels == 2)
|
||||
if (swf->audio_par->ch_layout.nb_channels == 2)
|
||||
v |= 0x01; /* stereo playback */
|
||||
avio_w8(s->pb, v);
|
||||
v |= 0x20; /* mp3 compressed */
|
||||
|
Loading…
Reference in New Issue
Block a user