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/libx264.c | |
| parent | 4b6b1082a73907c7c3de2646c6398bc61320f2c6 (diff) | |
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/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 531d8970d7..a4af21166e 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -346,7 +346,7 @@ static av_cold int X264_init(AVCodecContext *avctx) x264_param_default(&x4->params); #endif - x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; + x4->params.b_deblocking_filter = avctx->flags & AV_CODEC_FLAG_LOOP_FILTER; if (x4->preset || x4->tune) if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) { @@ -368,8 +368,8 @@ static av_cold int X264_init(AVCodecContext *avctx) } x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000; x4->params.rc.i_vbv_max_bitrate = avctx->rc_max_rate / 1000; - x4->params.rc.b_stat_write = avctx->flags & CODEC_FLAG_PASS1; - if (avctx->flags & CODEC_FLAG_PASS2) { + x4->params.rc.b_stat_write = avctx->flags & AV_CODEC_FLAG_PASS1; + if (avctx->flags & AV_CODEC_FLAG_PASS2) { x4->params.rc.b_stat_read = 1; } else { if (x4->crf >= 0) { @@ -515,15 +515,15 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.i_fps_num = x4->params.i_timebase_den = avctx->time_base.den; x4->params.i_fps_den = x4->params.i_timebase_num = avctx->time_base.num; - x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; + x4->params.analyse.b_psnr = avctx->flags & AV_CODEC_FLAG_PSNR; x4->params.i_threads = avctx->thread_count; if (avctx->thread_type) x4->params.b_sliced_threads = avctx->thread_type == FF_THREAD_SLICE; - x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT; + x4->params.b_interlaced = avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT; - x4->params.b_open_gop = !(avctx->flags & CODEC_FLAG_CLOSED_GOP); + x4->params.b_open_gop = !(avctx->flags & AV_CODEC_FLAG_CLOSED_GOP); x4->params.i_slice_count = avctx->slices; @@ -537,7 +537,7 @@ FF_ENABLE_DEPRECATION_WARNINGS x4->params.vui.i_transfer = avctx->color_trc; x4->params.vui.i_colmatrix = avctx->colorspace; - if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; if (x4->x264_params) { @@ -568,7 +568,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!x4->enc) return AVERROR_UNKNOWN; - if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { + if (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER) { x264_nal_t *nal; uint8_t *p; int nnal, s, i; |