Mercurial > libavformat.hg
comparison idroq.c @ 3908:1d3d17de20ba libavformat
Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
author | michael |
---|---|
date | Mon, 08 Sep 2008 14:24:59 +0000 |
parents | 31a0f3b99ef7 |
children | 549a09cf23fe |
comparison
equal
deleted
inserted
replaced
3907:7c71e9cabf0e | 3908:1d3d17de20ba |
---|---|
159 st->codec->codec_type = CODEC_TYPE_AUDIO; | 159 st->codec->codec_type = CODEC_TYPE_AUDIO; |
160 st->codec->codec_id = CODEC_ID_ROQ_DPCM; | 160 st->codec->codec_id = CODEC_ID_ROQ_DPCM; |
161 st->codec->codec_tag = 0; /* no tag */ | 161 st->codec->codec_tag = 0; /* no tag */ |
162 st->codec->channels = roq->audio_channels; | 162 st->codec->channels = roq->audio_channels; |
163 st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE; | 163 st->codec->sample_rate = RoQ_AUDIO_SAMPLE_RATE; |
164 st->codec->bits_per_sample = 16; | 164 st->codec->bits_per_coded_sample = 16; |
165 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * | 165 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * |
166 st->codec->bits_per_sample; | 166 st->codec->bits_per_coded_sample; |
167 st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; | 167 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; |
168 } | 168 } |
169 | 169 |
170 return 0; | 170 return 0; |
171 } | 171 } |
172 | 172 |