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/mpegvideo.c | |
parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
download | ffmpeg-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/mpegvideo.c')
-rw-r--r-- | libavcodec/mpegvideo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 6d9e265eef..16ec875c8e 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1175,11 +1175,11 @@ static void gray_frame(AVFrame *frame) for(i=0; i<frame->height; i++) memset(frame->data[0] + frame->linesize[0]*i, 0x80, frame->width); - for(i=0; i<FF_CEIL_RSHIFT(frame->height, v_chroma_shift); i++) { + for(i=0; i<AV_CEIL_RSHIFT(frame->height, v_chroma_shift); i++) { memset(frame->data[1] + frame->linesize[1]*i, - 0x80, FF_CEIL_RSHIFT(frame->width, h_chroma_shift)); + 0x80, AV_CEIL_RSHIFT(frame->width, h_chroma_shift)); memset(frame->data[2] + frame->linesize[2]*i, - 0x80, FF_CEIL_RSHIFT(frame->width, h_chroma_shift)); + 0x80, AV_CEIL_RSHIFT(frame->width, h_chroma_shift)); } } @@ -1323,11 +1323,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) memset(s->last_picture_ptr->f->data[0] + s->last_picture_ptr->f->linesize[0]*i, 0x80, avctx->width); if (s->last_picture_ptr->f->data[2]) { - for(i=0; i<FF_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) { + for(i=0; i<AV_CEIL_RSHIFT(avctx->height, v_chroma_shift); i++) { memset(s->last_picture_ptr->f->data[1] + s->last_picture_ptr->f->linesize[1]*i, - 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); + 0x80, AV_CEIL_RSHIFT(avctx->width, h_chroma_shift)); memset(s->last_picture_ptr->f->data[2] + s->last_picture_ptr->f->linesize[2]*i, - 0x80, FF_CEIL_RSHIFT(avctx->width, h_chroma_shift)); + 0x80, AV_CEIL_RSHIFT(avctx->width, h_chroma_shift)); } } |