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/ipmovie.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
| download | ffmpeg-dd1c8f3e6e5380f993c86750bb09fd42e130143f.tar.gz | |
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/ipmovie.c')
| -rw-r--r-- | libavformat/ipmovie.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index c2c5585daa..839e099a5e 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -574,12 +574,12 @@ static int ipmovie_read_header(AVFormatContext *s, st->codec->codec_tag = 0; /* no tag */ st->codec->channels = ipmovie->audio_channels; st->codec->sample_rate = ipmovie->audio_sample_rate; - st->codec->bits_per_sample = ipmovie->audio_bits; + st->codec->bits_per_coded_sample = ipmovie->audio_bits; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample; + st->codec->bits_per_coded_sample; if (st->codec->codec_id == CODEC_ID_INTERPLAY_DPCM) st->codec->bit_rate /= 2; - st->codec->block_align = st->codec->channels * st->codec->bits_per_sample; + st->codec->block_align = st->codec->channels * st->codec->bits_per_coded_sample; } return 0; |