diff options
| author | Luca Abeni <lucabe72@email.it> | 2008-09-08 14:24:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 14:24:59 +0000 |
| commit | dd1c8f3e6e5380f993c86750bb09fd42e130143f (patch) | |
| tree | 2ae5b2bbda1b685069f4db6ed408097288590dde /libavcodec/qtrle.c | |
| parent | 71375e05006e68fecdeb8d5fa80c3cce52a5cf86 (diff) | |
| download | ffmpeg-dd1c8f3e6e5380f993c86750bb09fd42e130143f.tar.gz | |
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
Diffstat (limited to 'libavcodec/qtrle.c')
| -rw-r--r-- | libavcodec/qtrle.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 547c689e63..33a7eb5731 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -383,7 +383,7 @@ static av_cold int qtrle_decode_init(AVCodecContext *avctx) QtrleContext *s = avctx->priv_data; s->avctx = avctx; - switch (avctx->bits_per_sample) { + switch (avctx->bits_per_coded_sample) { case 1: case 33: avctx->pix_fmt = PIX_FMT_MONOWHITE; @@ -412,7 +412,7 @@ static av_cold int qtrle_decode_init(AVCodecContext *avctx) default: av_log (avctx, AV_LOG_ERROR, "Unsupported colorspace: %d bits/sample?\n", - avctx->bits_per_sample); + avctx->bits_per_coded_sample); break; } @@ -466,7 +466,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx, } row_ptr = s->frame.linesize[0] * start_line; - switch (avctx->bits_per_sample) { + switch (avctx->bits_per_coded_sample) { case 1: case 33: qtrle_decode_1bpp(s, stream_ptr, row_ptr, height); @@ -504,7 +504,7 @@ static int qtrle_decode_frame(AVCodecContext *avctx, default: av_log (s->avctx, AV_LOG_ERROR, "Unsupported colorspace: %d bits/sample?\n", - avctx->bits_per_sample); + avctx->bits_per_coded_sample); break; } |