diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-06-29 21:59:37 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-07-27 15:24:58 +0100 |
| commit | 7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 (patch) | |
| tree | 4613835d2ddad31bb5603827f28d8a4a6e4d9e21 /libavcodec/mpegvideo_motion.c | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
| download | ffmpeg-7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615.tar.gz | |
lavc: AV-prefix all codec flags
Convert doxygen to multiline and express bitfields more simply.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/mpegvideo_motion.c')
| -rw-r--r-- | libavcodec/mpegvideo_motion.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index c1c9221439..05375a1afa 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -87,7 +87,7 @@ static void gmc1_motion(MpegEncContext *s, } } - if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) + if (CONFIG_GRAY && s->avctx->flags & AV_CODEC_FLAG_GRAY) return; motion_x = s->sprite_offset[1][0]; @@ -164,7 +164,7 @@ static void gmc_motion(MpegEncContext *s, a + 1, (1 << (2 * a + 1)) - s->no_rounding, s->h_edge_pos, s->v_edge_pos); - if (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY) + if (CONFIG_GRAY && s->avctx->flags & AV_CODEC_FLAG_GRAY) return; ox = s->sprite_offset[1][0] + s->sprite_delta[0][0] * s->mb_x * 8 + @@ -324,7 +324,7 @@ void mpeg_motion_internal(MpegEncContext *s, src_x, src_y << field_based, s->h_edge_pos, s->v_edge_pos); ptr_y = s->sc.edge_emu_buffer; - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) { + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { uint8_t *uvbuf = s->sc.edge_emu_buffer + 18 * s->linesize; s->vdsp.emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, s->uvlinesize, @@ -357,7 +357,7 @@ void mpeg_motion_internal(MpegEncContext *s, pix_op[0][dxy](dest_y, ptr_y, linesize, h); - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) { + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { pix_op[s->chroma_x_shift][uvdxy] (dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift); pix_op[s->chroma_x_shift][uvdxy] @@ -545,7 +545,7 @@ static inline void qpel_motion(MpegEncContext *s, src_x, src_y << field_based, s->h_edge_pos, s->v_edge_pos); ptr_y = s->sc.edge_emu_buffer; - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) { + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { uint8_t *uvbuf = s->sc.edge_emu_buffer + 18 * s->linesize; s->vdsp.emulated_edge_mc(uvbuf, ptr_cb, s->uvlinesize, s->uvlinesize, @@ -581,7 +581,7 @@ static inline void qpel_motion(MpegEncContext *s, qpix_op[1][dxy](dest_y, ptr_y, linesize); qpix_op[1][dxy](dest_y + 8, ptr_y + 8, linesize); } - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) { + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) { pix_op[1][uvdxy](dest_cr, ptr_cr, uvlinesize, h >> 1); pix_op[1][uvdxy](dest_cb, ptr_cb, uvlinesize, h >> 1); } @@ -737,7 +737,7 @@ static inline void apply_obmc(MpegEncContext *s, mx += mv[0][0]; my += mv[0][1]; } - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); @@ -810,7 +810,7 @@ static inline void apply_8x8(MpegEncContext *s, } } - if (!CONFIG_GRAY || !(s->avctx->flags & CODEC_FLAG_GRAY)) + if (!CONFIG_GRAY || !(s->avctx->flags & AV_CODEC_FLAG_GRAY)) chroma_4mv_motion(s, dest_cb, dest_cr, ref_picture, pix_op[1], mx, my); } |