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

smacker: convert to new channel layout API

Browse Source 
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:31:51 +02:00
committed by James Almer
parent 736a45f898
commit 677fea79b7
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/smacker.c
View File

@@ -186,13 +186,8 @@ static int smacker_read_header(AVFormatContext *s)
} else { } else {
par->codec_id = AV_CODEC_ID_PCM_U8; par->codec_id = AV_CODEC_ID_PCM_U8;
} }
if (aflag & SMK_AUD_STEREO) { av_channel_layout_default(&par->ch_layout,
par->channels = 2; !!(aflag & SMK_AUD_STEREO) + 1);
par->channel_layout = AV_CH_LAYOUT_STEREO;
} else {
par->channels = 1;
par->channel_layout = AV_CH_LAYOUT_MONO;
}
par->sample_rate = rate; par->sample_rate = rate;
par->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8; par->bits_per_coded_sample = (aflag & SMK_AUD_16BITS) ? 16 : 8;
if (par->bits_per_coded_sample == 16 && if (par->bits_per_coded_sample == 16 &&
@@ -200,7 +195,7 @@ static int smacker_read_header(AVFormatContext *s)
par->codec_id = AV_CODEC_ID_PCM_S16LE; par->codec_id = AV_CODEC_ID_PCM_S16LE;
else else
smk->duration_size[i] = 4; smk->duration_size[i] = 4;
avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->channels avpriv_set_pts_info(ast, 64, 1, par->sample_rate * par->ch_layout.nb_channels
* par->bits_per_coded_sample / 8); * par->bits_per_coded_sample / 8);
} }
} }