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/apc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/apc.c') diff --git a/libavformat/apc.c b/libavformat/apc.c index 20de1c7e58..14701d9229 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -62,8 +62,8 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) if (get_le32(pb)) st->codec->channels = 2; - st->codec->bits_per_sample = 4; - st->codec->bit_rate = st->codec->bits_per_sample * st->codec->channels + st->codec->bits_per_coded_sample = 4; + st->codec->bit_rate = st->codec->bits_per_coded_sample * st->codec->channels * st->codec->sample_rate; st->codec->block_align = 1; -- cgit v1.2.3