diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-27 19:13:25 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-05-22 15:34:39 +0100 |
| commit | 848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42 (patch) | |
| tree | e02dd312ec6d21fb183d1fda8172758156594e05 /libavcodec/vc1_mc.c | |
| parent | 29216d7fd14d1cec16821867d17c90b5c49e8c07 (diff) | |
| download | ffmpeg-848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42.tar.gz | |
mpegvideo: Drop flags and flags2
They are just duplicates of AVCodecContext members so use those instead.
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 e3a75d5845..4dcb2f5a54 100644 --- a/libavcodec/vc1_mc.c +++ b/libavcodec/vc1_mc.c @@ -136,7 +136,7 @@ void ff_vc1_mc_1mv(VC1Context *v, int dir) } /* for grayscale we should not try to read from unknown area */ - if (s->flags & CODEC_FLAG_GRAY) { + if (s->avctx->flags & CODEC_FLAG_GRAY) { srcU = s->edge_emu_buffer + 18 * s->linesize; srcV = s->edge_emu_buffer + 18 * s->linesize; } @@ -228,7 +228,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 (s->flags & CODEC_FLAG_GRAY) return; + if (s->avctx->flags & CODEC_FLAG_GRAY) + return; /* Chroma MC always uses qpel bilinear */ uvmx = (uvmx & 3) << 1; uvmy = (uvmy & 3) << 1; @@ -514,7 +515,7 @@ void ff_vc1_mc_4mv_chroma(VC1Context *v, int dir) if (!v->field_mode && !v->s.last_picture.f->data[0]) return; - if (s->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & CODEC_FLAG_GRAY) return; for (k = 0; k < 4; k++) { @@ -685,7 +686,7 @@ void ff_vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg) int use_ic; uint8_t (*lutuv)[256]; - if (s->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & CODEC_FLAG_GRAY) return; for (i = 0; i < 4; i++) { @@ -836,7 +837,7 @@ void ff_vc1_interp_mc(VC1Context *v) } /* for grayscale we should not try to read from unknown area */ - if (s->flags & CODEC_FLAG_GRAY) { + if (s->avctx->flags & CODEC_FLAG_GRAY) { srcU = s->edge_emu_buffer + 18 * s->linesize; srcV = s->edge_emu_buffer + 18 * s->linesize; } @@ -933,7 +934,8 @@ void ff_vc1_interp_mc(VC1Context *v) s->hdsp.avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY, s->linesize, 16); } - if (s->flags & CODEC_FLAG_GRAY) return; + if (s->avctx->flags & CODEC_FLAG_GRAY) + return; /* Chroma MC always uses qpel blilinear */ uvmx = (uvmx & 3) << 1; uvmy = (uvmy & 3) << 1; |