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/idcin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/idcin.c') diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 1a8e558e5d..55ad28b080 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -181,7 +181,7 @@ static int idcin_read_header(AVFormatContext *s, st->codec->codec_tag = 1; st->codec->channels = channels; st->codec->sample_rate = sample_rate; - st->codec->bits_per_sample = bytes_per_sample * 8; + st->codec->bits_per_coded_sample = bytes_per_sample * 8; st->codec->bit_rate = sample_rate * bytes_per_sample * 8 * channels; st->codec->block_align = bytes_per_sample * channels; if (bytes_per_sample == 1) -- cgit v1.2.3