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/mmf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat/mmf.c') diff --git a/libavformat/mmf.c b/libavformat/mmf.c index d23df63454..3941bee14a 100644 --- a/libavformat/mmf.c +++ b/libavformat/mmf.c @@ -248,8 +248,8 @@ static int mmf_read_header(AVFormatContext *s, st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA; st->codec->sample_rate = rate; st->codec->channels = 1; - st->codec->bits_per_sample = 4; - st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_sample; + st->codec->bits_per_coded_sample = 4; + st->codec->bit_rate = st->codec->sample_rate * st->codec->bits_per_coded_sample; av_set_pts_info(st, 64, 1, st->codec->sample_rate); -- cgit v1.2.3