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/vc1_loopfilter.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/vc1_loopfilter.c')
| -rw-r--r-- | libavcodec/vc1_loopfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c index 1a7037fcb2..f7eec17e25 100644 --- a/libavcodec/vc1_loopfilter.c +++ b/libavcodec/vc1_loopfilter.c @@ -110,7 +110,7 @@ void ff_vc1_loop_filter_iblk_delayed(VC1Context *v, int pq) if (s->mb_x >= 2) v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize - 16, s->linesize, pq); v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize - 8, s->linesize, pq); - if (s->mb_x >= 2 && !(s->flags & CODEC_FLAG_GRAY)) { + if (s->mb_x >= 2 && (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY))) { for (j = 0; j < 2; j++) { v->vc1dsp.vc1_h_loop_filter8(s->dest[j + 1] - 8 * s->uvlinesize - 8, s->uvlinesize, pq); } @@ -121,7 +121,7 @@ void ff_vc1_loop_filter_iblk_delayed(VC1Context *v, int pq) if (s->mb_x) v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize, s->linesize, pq); v->vc1dsp.vc1_h_loop_filter16(s->dest[0] - 16 * s->linesize + 8, s->linesize, pq); - if (s->mb_x && !(s->flags & CODEC_FLAG_GRAY)) { + if (s->mb_x && (!CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY))) { for (j = 0; j < 2; j++) { v->vc1dsp.vc1_h_loop_filter8(s->dest[j + 1] - 8 * s->uvlinesize, s->uvlinesize, pq); } |