From 7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 29 Jun 2015 21:59:37 +0200 Subject: lavc: AV-prefix all codec flags Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara --- libavcodec/h264_ps.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavcodec/h264_ps.c') diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 23615d527b..fa9fa7d25b 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -444,7 +444,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) unsigned int crop_top = get_ue_golomb(&h->gb); unsigned int crop_bottom = get_ue_golomb(&h->gb); - if (h->avctx->flags2 & CODEC_FLAG2_IGNORE_CROP) { + if (h->avctx->flags2 & AV_CODEC_FLAG2_IGNORE_CROP) { av_log(h->avctx, AV_LOG_DEBUG, "discarding sps cropping, original " "values are l:%d r:%d t:%d b:%d\n", crop_left, crop_right, crop_top, crop_bottom); @@ -461,7 +461,7 @@ int ff_h264_decode_seq_parameter_set(H264Context *h) int step_y = (2 - sps->frame_mbs_only_flag) << vsub; if (crop_left & (0x1F >> (sps->bit_depth_luma > 8)) && - !(h->avctx->flags & CODEC_FLAG_UNALIGNED)) { + !(h->avctx->flags & AV_CODEC_FLAG_UNALIGNED)) { crop_left &= ~(0x1F >> (sps->bit_depth_luma > 8)); av_log(h->avctx, AV_LOG_WARNING, "Reducing left cropping to %d " -- cgit v1.2.3