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 --- libavcodec/msrle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/msrle.c') diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index ceffae8bb0..4ea00f6915 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -264,7 +264,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, return -1; } - switch (avctx->bits_per_sample) { + switch (avctx->bits_per_coded_sample) { case 8: msrle_decode_pal8(s); break; @@ -273,7 +273,7 @@ static int msrle_decode_frame(AVCodecContext *avctx, break; default: av_log(avctx, AV_LOG_ERROR, "Don't know how to decode depth %u.\n", - avctx->bits_per_sample); + avctx->bits_per_coded_sample); } *data_size = sizeof(AVFrame); -- cgit v1.2.3