diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:12:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 20:24:41 +0200 |
| commit | d9b264bc73723ce538d72f28a4a8fb4f85af7eca (patch) | |
| tree | 7a2f93dbd9adf87534c29c932ed157941a2c4af6 /libavcodec/vc1_mc.c | |
| parent | 337aa17e61091500b95d6127c9ffd65d9086decb (diff) | |
| parent | 848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42 (diff) | |
| download | ffmpeg-d9b264bc73723ce538d72f28a4a8fb4f85af7eca.tar.gz | |
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
mpegvideo: Drop flags and flags2
Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1_mc.c')
| -rw-r--r-- | libavcodec/vc1_mc.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libavcodec/vc1_mc.c b/libavcodec/vc1_mc.c index 6236036dbf..1a78c178db 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -270,7 +270,7 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) } /* for grayscale we should not try to read from unknown area */ - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) { + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) { srcU = s->edge_emu_buffer + 18 * s->linesize; srcV = s->edge_emu_buffer + 18 * s->linesize; } @@ -332,7 +332,8 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) s->hdsp.put_no_rnd_pixels_tab[0][dxy](s->dest[0], srcY, s->linesize, 16); } - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) return; + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) + return; /* Chroma MC always uses qpel bilinear */ uvmx = (uvmx & 3) << 1; uvmy = (uvmy & 3) << 1; @@ -517,7 +518,7 @@ void ff_vc1_mc_4mv_chroma(VC1Context *v, int dir) if (!v->field_mode && !v->s.last_picture.f->data[0]) return; - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) return; /* calculate chroma MV vector from four luma MVs */ @@ -654,7 +655,7 @@ void ff_vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg) int use_ic; uint8_t (*lutuv)[256]; - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) return; for (i = 0; i < 4; i++) { @@ -800,7 +801,7 @@ void ff_vc1_interp_mc(VC1Context *v) } /* for grayscale we should not try to read from unknown area */ - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) { + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) { srcU = s->edge_emu_buffer + 18 * s->linesize; srcV = s->edge_emu_buffer + 18 * s->linesize; } @@ -864,7 +865,8 @@ void ff_vc1_interp_mc(VC1Context *v) s->hdsp.avg_no_rnd_pixels_tab[dxy](s->dest[0], srcY, s->linesize, 16); } - if (CONFIG_GRAY && s->flags & CODEC_FLAG_GRAY) return; + if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) + return; /* Chroma MC always uses qpel blilinear */ uvmx = (uvmx & 3) << 1; uvmy = (uvmy & 3) << 1; |