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 /libswscale/x86 | |
| 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 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/rgb2rgb_template.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libswscale/x86/rgb2rgb_template.c b/libswscale/x86/rgb2rgb_template.c index b56e15cf36..95d4f8fd8a 100644 --- a/libswscale/x86/rgb2rgb_template.c +++ b/libswscale/x86/rgb2rgb_template.c @@ -2457,7 +2457,7 @@ static void RENAME(yuyvtoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co int lumStride, int chromStride, int srcStride) { int y; - const int chromWidth = FF_CEIL_RSHIFT(width, 1); + const int chromWidth = AV_CEIL_RSHIFT(width, 1); for (y=0; y<height; y++) { RENAME(extract_even)(src, ydst, width); @@ -2483,7 +2483,7 @@ static void RENAME(yuyvtoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co int lumStride, int chromStride, int srcStride) { int y; - const int chromWidth = FF_CEIL_RSHIFT(width, 1); + const int chromWidth = AV_CEIL_RSHIFT(width, 1); for (y=0; y<height; y++) { RENAME(extract_even)(src, ydst, width); @@ -2507,7 +2507,7 @@ static void RENAME(uyvytoyuv420)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co int lumStride, int chromStride, int srcStride) { int y; - const int chromWidth = FF_CEIL_RSHIFT(width, 1); + const int chromWidth = AV_CEIL_RSHIFT(width, 1); for (y=0; y<height; y++) { RENAME(extract_odd)(src, ydst, width); @@ -2533,7 +2533,7 @@ static void RENAME(uyvytoyuv422)(uint8_t *ydst, uint8_t *udst, uint8_t *vdst, co int lumStride, int chromStride, int srcStride) { int y; - const int chromWidth = FF_CEIL_RSHIFT(width, 1); + const int chromWidth = AV_CEIL_RSHIFT(width, 1); for (y=0; y<height; y++) { RENAME(extract_odd)(src, ydst, width); |