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/snow.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/snow.c')
| -rw-r--r-- | libavcodec/snow.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index fc2e7279f3..a3e6afc86a 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -108,8 +108,8 @@ void ff_snow_reset_contexts(SnowContext *s){ //FIXME better initial contexts } int ff_snow_alloc_blocks(SnowContext *s){ - int w= FF_CEIL_RSHIFT(s->avctx->width, LOG2_MB_SIZE); - int h= FF_CEIL_RSHIFT(s->avctx->height, LOG2_MB_SIZE); + int w= AV_CEIL_RSHIFT(s->avctx->width, LOG2_MB_SIZE); + int h= AV_CEIL_RSHIFT(s->avctx->height, LOG2_MB_SIZE); s->b_width = w; s->b_height= h; @@ -535,8 +535,8 @@ int ff_snow_common_init_after_header(AVCodecContext *avctx) { int h= s->avctx->height; if(plane_index){ - w = FF_CEIL_RSHIFT(w, s->chroma_h_shift); - h = FF_CEIL_RSHIFT(h, s->chroma_v_shift); + w = AV_CEIL_RSHIFT(w, s->chroma_h_shift); + h = AV_CEIL_RSHIFT(h, s->chroma_v_shift); } s->plane[plane_index].width = w; s->plane[plane_index].height= h; @@ -590,8 +590,8 @@ static int halfpel_interpol(SnowContext *s, uint8_t *halfpel[4][4], AVFrame *fra for(p=0; p < s->nb_planes; p++){ int is_chroma= !!p; - int w= is_chroma ? FF_CEIL_RSHIFT(s->avctx->width, s->chroma_h_shift) : s->avctx->width; - int h= is_chroma ? FF_CEIL_RSHIFT(s->avctx->height, s->chroma_v_shift) : s->avctx->height; + int w= is_chroma ? AV_CEIL_RSHIFT(s->avctx->width, s->chroma_h_shift) : s->avctx->width; + int h= is_chroma ? AV_CEIL_RSHIFT(s->avctx->height, s->chroma_v_shift) : s->avctx->height; int ls= frame->linesize[p]; uint8_t *src= frame->data[p]; |