highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdv: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov 2019-05-13 11:11:26 +02:00 committed by James Almer
parent 201d6c1355
commit 2f18760840
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/gdv.c
View File

@ -99,7 +99,7 @@ static int gdv_read_header(AVFormatContext *ctx)
ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
ast->codecpar->codec_tag = 0; ast->codecpar->codec_tag = 0;
ast->codecpar->sample_rate = avio_rl16(pb); ast->codecpar->sample_rate = avio_rl16(pb);
ast->codecpar->channels = 1 + !!(snd_flags & 2); ast->codecpar->ch_layout.nb_channels = 1 + !!(snd_flags & 2);
if (snd_flags & 8) { if (snd_flags & 8) {
ast->codecpar->codec_id = AV_CODEC_ID_GREMLIN_DPCM; ast->codecpar->codec_id = AV_CODEC_ID_GREMLIN_DPCM;
} else { } else {
@ -108,7 +108,8 @@ static int gdv_read_header(AVFormatContext *ctx)
avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate); avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate);
gdv->audio_size = (ast->codecpar->sample_rate / fps) * gdv->audio_size = (ast->codecpar->sample_rate / fps) *
ast->codecpar->channels * (1 + !!(snd_flags & 4)) / (1 + !!(snd_flags & 8)); ast->codecpar->ch_layout.nb_channels *
(1 + !!(snd_flags & 4)) / (1 + !!(snd_flags & 8));
gdv->is_audio = 1; gdv->is_audio = 1;
} else { } else {
avio_skip(pb, 2); avio_skip(pb, 2);