From dd1c8f3e6e5380f993c86750bb09fd42e130143f Mon Sep 17 00:00:00 2001 From: Luca Abeni Date: Mon, 8 Sep 2008 14:24:59 +0000 Subject: 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 --- libavformat/segafilm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/segafilm.c') diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 4c6d138d6b..4bc46c2773 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -148,12 +148,12 @@ static int film_read_header(AVFormatContext *s, st->codec->codec_id = film->audio_type; st->codec->codec_tag = 1; st->codec->channels = film->audio_channels; - st->codec->bits_per_sample = film->audio_bits; + st->codec->bits_per_coded_sample = film->audio_bits; st->codec->sample_rate = film->audio_samplerate; st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * - st->codec->bits_per_sample; + st->codec->bits_per_coded_sample; st->codec->block_align = st->codec->channels * - st->codec->bits_per_sample / 8; + st->codec->bits_per_coded_sample / 8; } /* load the sample table */ -- cgit v1.2.3