Mercurial > libavcodec.hg
comparison msrle.c @ 7823:4525dcd81357 libavcodec
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!
author | michael |
---|---|
date | Mon, 08 Sep 2008 14:24:59 +0000 |
parents | e943e1409077 |
children | f874e1d5cf07 |
comparison
equal
deleted
inserted
replaced
7822:67cfe4983e6d | 7823:4525dcd81357 |
---|---|
262 if (avctx->reget_buffer(avctx, &s->frame)) { | 262 if (avctx->reget_buffer(avctx, &s->frame)) { |
263 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); | 263 av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); |
264 return -1; | 264 return -1; |
265 } | 265 } |
266 | 266 |
267 switch (avctx->bits_per_sample) { | 267 switch (avctx->bits_per_coded_sample) { |
268 case 8: | 268 case 8: |
269 msrle_decode_pal8(s); | 269 msrle_decode_pal8(s); |
270 break; | 270 break; |
271 case 4: | 271 case 4: |
272 msrle_decode_pal4(s); | 272 msrle_decode_pal4(s); |
273 break; | 273 break; |
274 default: | 274 default: |
275 av_log(avctx, AV_LOG_ERROR, "Don't know how to decode depth %u.\n", | 275 av_log(avctx, AV_LOG_ERROR, "Don't know how to decode depth %u.\n", |
276 avctx->bits_per_sample); | 276 avctx->bits_per_coded_sample); |
277 } | 277 } |
278 | 278 |
279 *data_size = sizeof(AVFrame); | 279 *data_size = sizeof(AVFrame); |
280 *(AVFrame*)data = s->frame; | 280 *(AVFrame*)data = s->frame; |
281 | 281 |