diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 15:19:38 +0000 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-27 16:36:46 +0000 |
commit | 21f946840260da150affd9a20cc35b3d56194ba6 (patch) | |
tree | 5ca004c2ff6cf737f6858a56ce17602c339d80e6 /libavcodec/utils.c | |
parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
download | ffmpeg-streaming-21f946840260da150affd9a20cc35b3d56194ba6.zip ffmpeg-streaming-21f946840260da150affd9a20cc35b3d56194ba6.tar.gz |
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r-- | libavcodec/utils.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index abddd6f..37326e4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -215,8 +215,8 @@ int ff_set_dimensions(AVCodecContext *s, int width, int height) s->coded_width = width; s->coded_height = height; - s->width = FF_CEIL_RSHIFT(width, s->lowres); - s->height = FF_CEIL_RSHIFT(height, s->lowres); + s->width = AV_CEIL_RSHIFT(width, s->lowres); + s->height = AV_CEIL_RSHIFT(height, s->lowres); return ret; } @@ -700,8 +700,8 @@ void ff_color_frame(AVFrame *frame, const int c[4]) for (p = 0; p<desc->nb_components; p++) { uint8_t *dst = frame->data[p]; int is_chroma = p == 1 || p == 2; - int bytes = is_chroma ? FF_CEIL_RSHIFT(frame->width, desc->log2_chroma_w) : frame->width; - int height = is_chroma ? FF_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height; + int bytes = is_chroma ? AV_CEIL_RSHIFT(frame->width, desc->log2_chroma_w) : frame->width; + int height = is_chroma ? AV_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height; for (y = 0; y < height; y++) { if (desc->comp[0].depth >= 9) { for (x = 0; x<bytes; x++) @@ -859,8 +859,8 @@ static int get_buffer_internal(AVCodecContext *avctx, AVFrame *frame, int flags) } if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { if (frame->width <= 0 || frame->height <= 0) { - frame->width = FFMAX(avctx->width, FF_CEIL_RSHIFT(avctx->coded_width, avctx->lowres)); - frame->height = FFMAX(avctx->height, FF_CEIL_RSHIFT(avctx->coded_height, avctx->lowres)); + frame->width = FFMAX(avctx->width, AV_CEIL_RSHIFT(avctx->coded_width, avctx->lowres)); + frame->height = FFMAX(avctx->height, AV_CEIL_RSHIFT(avctx->coded_height, avctx->lowres)); override_dimensions = 0; } } |