summaryrefslogtreecommitdiff
path: root/libavformat/omaenc.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavformat/omaenc.c')
-rw-r--r--libavformat/omaenc.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/omaenc.c b/libavformat/omaenc.c
index bfd552a03d..50f369d967 100644
--- a/libavformat/omaenc.c
+++ b/libavformat/omaenc.c
@@ -30,21 +30,21 @@
static av_cold int oma_write_header(AVFormatContext *s)
{
int i;
- AVCodecContext *format;
+ AVCodecParameters *par;
int srate_index;
int isjointstereo;
- format = s->streams[0]->codec;
+ par = s->streams[0]->codecpar;
/* check for support of the format first */
for (srate_index = 0; ; srate_index++) {
if (ff_oma_srate_tab[srate_index] == 0) {
av_log(s, AV_LOG_ERROR, "Sample rate %d not supported in OpenMG audio\n",
- format->sample_rate);
+ par->sample_rate);
return AVERROR(EINVAL);
}
- if (ff_oma_srate_tab[srate_index] * 100 == format->sample_rate)
+ if (ff_oma_srate_tab[srate_index] * 100 == par->sample_rate)
break;
}
@@ -58,16 +58,16 @@ static av_cold int oma_write_header(AVFormatContext *s)
for (i = 0; i < 6; i++)
avio_wl32(s->pb, 0); /* Padding + DRM id */
- switch(format->codec_tag) {
+ switch (par->codec_tag) {
case OMA_CODECID_ATRAC3:
- if (format->channels != 2) {
+ if (par->channels != 2) {
av_log(s, AV_LOG_ERROR, "ATRAC3 in OMA is only supported with 2 channels");
return AVERROR(EINVAL);
}
- if (format->extradata_size == 14) /* WAV format extradata */
- isjointstereo = format->extradata[6] != 0;
- else if(format->extradata_size == 10) /* RM format extradata */
- isjointstereo = format->extradata[8] == 0x12;
+ if (par->extradata_size == 14) /* WAV format extradata */
+ isjointstereo = par->extradata[6] != 0;
+ else if(par->extradata_size == 10) /* RM format extradata */
+ isjointstereo = par->extradata[8] == 0x12;
else {
av_log(s, AV_LOG_ERROR, "ATRAC3: Unsupported extradata size\n");
return AVERROR(EINVAL);
@@ -75,17 +75,17 @@ static av_cold int oma_write_header(AVFormatContext *s)
avio_wb32(s->pb, (OMA_CODECID_ATRAC3 << 24) |
(isjointstereo << 17) |
(srate_index << 13) |
- (format->block_align/8));
+ (par->block_align/8));
break;
case OMA_CODECID_ATRAC3P:
avio_wb32(s->pb, (OMA_CODECID_ATRAC3P << 24) |
(srate_index << 13) |
- (format->channels << 10) |
- (format->block_align/8 - 1));
+ (par->channels << 10) |
+ (par->block_align/8 - 1));
break;
default:
av_log(s, AV_LOG_ERROR, "OMA: unsupported codec tag %d for write\n",
- format->codec_tag);
+ par->codec_tag);
}
for (i = 0; i < (EA3_HEADER_SIZE - 36)/4; i++)
avio_wl32(s->pb, 0); /* Padding */