diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-05-17 12:58:44 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-05-17 12:58:44 +0200 |
| commit | 83356cf6cceb835e9bbed0ca94accb2cc32fcf03 (patch) | |
| tree | cf2794e55b3ff31b1fb3f8b8195740a9305c7b14 /libavcodec/vc1dec.c | |
| parent | ee8c18387d02a7ee5ee3317cf1cecd84a7e0d91a (diff) | |
| download | ffmpeg-83356cf6cceb835e9bbed0ca94accb2cc32fcf03.tar.gz | |
lavc/vc1: Never decode vc1 as gray if gray decoding was not enabled.
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index ad1d4d9fb1..99c3d0ce27 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -190,7 +190,7 @@ static void vc1_draw_sprites(VC1Context *v, SpriteData* sd) } alpha = av_clip_uint16(sd->coefs[1][6]); - for (plane = 0; plane < (s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++) { + for (plane = 0; plane < (CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++) { int width = v->output_width>>!!plane; for (row = 0; row < v->output_height>>!!plane; row++) { @@ -311,7 +311,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx) wrong but it looks better than doing nothing. */ if (f && f->data[0]) - for (plane = 0; plane < (s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++) + for (plane = 0; plane < (CONFIG_GRAY && s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++) for (i = 0; i < v->sprite_height>>!!plane; i++) memset(f->data[plane] + i * f->linesize[plane], plane ? 128 : 0, f->linesize[plane]); @@ -427,7 +427,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) if (!avctx->extradata_size || !avctx->extradata) return -1; - if (!(avctx->flags & CODEC_FLAG_GRAY)) + if (!CONFIG_GRAY || !(avctx->flags & CODEC_FLAG_GRAY)) avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); else { avctx->pix_fmt = AV_PIX_FMT_GRAY8; |