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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/img2enc.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpenc_jpeg.c | 4 | ||||
| -rw-r--r-- | libavformat/uncodedframecrcenc.c | 2 | ||||
| -rw-r--r-- | libavformat/yuv4mpegenc.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 9291802a2a..2f0aec1f02 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -129,7 +129,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (img->split_planes) { int ysize = codec->width * codec->height; - int usize = FF_CEIL_RSHIFT(codec->width, desc->log2_chroma_w) * FF_CEIL_RSHIFT(codec->height, desc->log2_chroma_h); + int usize = AV_CEIL_RSHIFT(codec->width, desc->log2_chroma_w) * AV_CEIL_RSHIFT(codec->height, desc->log2_chroma_h); if (desc->comp[0].depth >= 9) { ysize *= 2; usize *= 2; diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c index 60629cf179..72c07c7842 100644 --- a/libavformat/rtpenc_jpeg.c +++ b/libavformat/rtpenc_jpeg.c @@ -42,8 +42,8 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t *buf, int size) s->timestamp = s->cur_timestamp; /* convert video pixel dimensions from pixels to blocks */ - w = FF_CEIL_RSHIFT(s1->streams[0]->codec->width, 3); - h = FF_CEIL_RSHIFT(s1->streams[0]->codec->height, 3); + w = AV_CEIL_RSHIFT(s1->streams[0]->codec->width, 3); + h = AV_CEIL_RSHIFT(s1->streams[0]->codec->height, 3); /* get the pixel format type or fail */ if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P || diff --git a/libavformat/uncodedframecrcenc.c b/libavformat/uncodedframecrcenc.c index 17f478626e..ed4532daf1 100644 --- a/libavformat/uncodedframecrcenc.c +++ b/libavformat/uncodedframecrcenc.c @@ -64,7 +64,7 @@ static void video_frame_cksum(AVBPrint *bp, AVFrame *frame) unsigned cksum = 0; int h = frame->height; if ((i == 1 || i == 2) && desc->nb_components >= 3) - h = FF_CEIL_RSHIFT(h, desc->log2_chroma_h); + h = AV_CEIL_RSHIFT(h, desc->log2_chroma_h); data = frame->data[i]; for (y = 0; y < h; y++) { cksum = av_adler32_update(cksum, data, linesize[i]); diff --git a/libavformat/yuv4mpegenc.c b/libavformat/yuv4mpegenc.c index 25bf13f15d..6120c7e520 100644 --- a/libavformat/yuv4mpegenc.c +++ b/libavformat/yuv4mpegenc.c @@ -209,8 +209,8 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) // Adjust for smaller Cb and Cr planes av_pix_fmt_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift, &v_chroma_shift); - width = FF_CEIL_RSHIFT(width, h_chroma_shift); - height = FF_CEIL_RSHIFT(height, v_chroma_shift); + width = AV_CEIL_RSHIFT(width, h_chroma_shift); + height = AV_CEIL_RSHIFT(height, v_chroma_shift); ptr1 = frame->data[1]; ptr2 = frame->data[2]; |