Mercurial > libavformat.hg
comparison iff.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 | 7a0230981402 |
| children | a209d26d63c2 |
comparison
equal
deleted
inserted
replaced
| 3907:7c71e9cabf0e | 3908:1d3d17de20ba |
|---|---|
| 147 default: | 147 default: |
| 148 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n"); | 148 av_log(s, AV_LOG_ERROR, "iff: unknown compression method\n"); |
| 149 return -1; | 149 return -1; |
| 150 } | 150 } |
| 151 | 151 |
| 152 st->codec->bits_per_sample = 8; | 152 st->codec->bits_per_coded_sample = 8; |
| 153 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_sample; | 153 st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample; |
| 154 st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; | 154 st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; |
| 155 | 155 |
| 156 return 0; | 156 return 0; |
| 157 } | 157 } |
| 158 | 158 |
| 159 static int iff_read_packet(AVFormatContext *s, | 159 static int iff_read_packet(AVFormatContext *s, |