diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-09-08 14:24:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 14:24:59 +0000 |
| commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
| tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavformat/4xm.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
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!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/4xm.c')
| -rw-r--r-- | libavformat/4xm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/4xm.c b/libavformat/4xm.c index 25c2080d7f..f8537165b5 100644 --- a/libavformat/4xm.c +++ b/libavformat/4xm.c @@ -193,13 +193,13 @@ static int fourxm_read_header(AVFormatContext *s, st->codec->codec_tag = 0; st->codec->channels = fourxm->tracks[current_track].channels; st->codec->sample_rate = fourxm->tracks[current_track].sample_rate; - st->codec->bits_per_sample = fourxm->tracks[current_track].bits; + st->codec->bits_per_coded_sample = fourxm->tracks[current_track].bits; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; + st->codec->bits_per_coded_sample; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; if (fourxm->tracks[current_track].adpcm) st->codec->codec_id = CODEC_ID_ADPCM_4XM; - else if (st->codec->bits_per_sample == 8) + else if (st->codec->bits_per_coded_sample == 8) st->codec->codec_id = CODEC_ID_PCM_U8; else st->codec->codec_id = CODEC_ID_PCM_S16LE; |