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/wv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavformat/wv.c') diff --git a/libavformat/wv.c b/libavformat/wv.c index eddd32148a..c9f71f95bd 100644 --- a/libavformat/wv.c +++ b/libavformat/wv.c @@ -151,7 +151,7 @@ static int wv_read_header(AVFormatContext *s, st->codec->codec_id = CODEC_ID_WAVPACK; st->codec->channels = wc->chan; st->codec->sample_rate = wc->rate; - st->codec->bits_per_sample = wc->bpp; + st->codec->bits_per_coded_sample = wc->bpp; av_set_pts_info(st, 64, 1, wc->rate); s->start_time = 0; s->duration = (int64_t)wc->samples * AV_TIME_BASE / st->codec->sample_rate; -- cgit v1.2.3