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/asvenc.c | |
| parent | 0aada30510d809bccfd539a90ea37b61188f2cb4 (diff) | |
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/asvenc.c')
| -rw-r--r-- | libavcodec/asvenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index d51df80331..ec98a0ce35 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -245,10 +245,10 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, for (i = 0; i<3; i++) { int x, y; - int w = FF_CEIL_RSHIFT(pict->width, !!i); - int h = FF_CEIL_RSHIFT(pict->height, !!i); - int w2 = FF_CEIL_RSHIFT(clone->width, !!i); - int h2 = FF_CEIL_RSHIFT(clone->height, !!i); + int w = AV_CEIL_RSHIFT(pict->width, !!i); + int h = AV_CEIL_RSHIFT(pict->height, !!i); + int w2 = AV_CEIL_RSHIFT(clone->width, !!i); + int h2 = AV_CEIL_RSHIFT(clone->height, !!i); for (y=0; y<h; y++) for (x=w; x<w2; x++) clone->data[i][x + y*clone->linesize[i]] = |