virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases 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
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_tag = 0;
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) {
ast->codecpar->codec_id = AV_CODEC_ID_GREMLIN_DPCM;
} else {
@@ -108,7 +108,8 @@ static int gdv_read_header(AVFormatContext *ctx)
avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate);
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;
} else {
avio_skip(pb, 2);