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 /libavdevice | |
| 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 'libavdevice')
| -rw-r--r-- | libavdevice/opengl_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c index 851b94735d..ba8d36abff 100644 --- a/libavdevice/opengl_enc.c +++ b/libavdevice/opengl_enc.c @@ -1032,8 +1032,8 @@ static av_cold int opengl_init_context(OpenGLContext *opengl) for (i = 1; i < num_planes; i++) if (opengl->non_pow_2_textures) opengl_configure_texture(opengl, opengl->texture_name[i], - FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w), - FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h)); + AV_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w), + AV_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h)); else opengl_configure_texture(opengl, opengl->texture_name[i], opengl->width, opengl->height); if (has_alpha) @@ -1135,8 +1135,8 @@ static uint8_t* opengl_get_plane_pointer(OpenGLContext *opengl, AVPacket *pkt, i { uint8_t *data = pkt->data; int wordsize = opengl_type_size(opengl->type); - int width_chroma = FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w); - int height_chroma = FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h); + int width_chroma = AV_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w); + int height_chroma = AV_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h); int plane = desc->comp[comp_index].plane; switch(plane) { @@ -1161,8 +1161,8 @@ static uint8_t* opengl_get_plane_pointer(OpenGLContext *opengl, AVPacket *pkt, i #define LOAD_TEXTURE_DATA(comp_index, sub) \ { \ - int width = sub ? FF_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w) : opengl->width; \ - int height = sub ? FF_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h): opengl->height; \ + int width = sub ? AV_CEIL_RSHIFT(opengl->width, desc->log2_chroma_w) : opengl->width; \ + int height = sub ? AV_CEIL_RSHIFT(opengl->height, desc->log2_chroma_h): opengl->height; \ uint8_t *data; \ int plane = desc->comp[comp_index].plane; \ \ |