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

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:
Vittorio Giovara 2017-03-31 18:38:42 +02:00 committed by James Almer
parent d38166a832
commit 9ff843eb4a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/swfdec.c
View File

@ -195,13 +195,7 @@ static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info)
if (!ast) if (!ast)
return NULL; return NULL;
ast->id = id; ast->id = id;
if (info & 1) { av_channel_layout_default(&ast->codecpar->ch_layout, 1 + (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;
}
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codecpar->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15); ast->codecpar->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15);
ffstream(ast)->need_parsing = AVSTREAM_PARSE_FULL; ffstream(ast)->need_parsing = AVSTREAM_PARSE_FULL;

2
libavformat/swfenc.c
View File

@ -348,7 +348,7 @@ static int swf_write_header(AVFormatContext *s)
return -1; return -1;
} }
v |= 0x02; /* 16 bit playback */ v |= 0x02; /* 16 bit playback */
if (swf->audio_par->channels == 2) if (swf->audio_par->ch_layout.nb_channels == 2)
v |= 0x01; /* stereo playback */ v |= 0x01; /* stereo playback */
avio_w8(s->pb, v); avio_w8(s->pb, v);
v |= 0x20; /* mp3 compressed */ v |= 0x20; /* mp3 compressed */