Mercurial > libavformat.hg
diff ipmovie.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 |
line wrap: on
line diff
--- a/ipmovie.c Mon Sep 08 00:58:24 2008 +0000 +++ b/ipmovie.c Mon Sep 08 14:24:59 2008 +0000 @@ -574,12 +574,12 @@ 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;