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/txd.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/txd.c')
| -rw-r--r-- | libavcodec/txd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/txd.c b/libavcodec/txd.c index 0c95faaf89..d7fdde0872 100644 --- a/libavcodec/txd.c +++ b/libavcodec/txd.c @@ -104,7 +104,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (!(flags & 1)) goto unsupported; case TXD_DXT1: - if (bytestream2_get_bytes_left(&gb) < FF_CEIL_RSHIFT(w, 2) * FF_CEIL_RSHIFT(h, 2) * 8) + if (bytestream2_get_bytes_left(&gb) < AV_CEIL_RSHIFT(w, 2) * AV_CEIL_RSHIFT(h, 2) * 8) return AVERROR_INVALIDDATA; for (j = 0; j < avctx->height; j += 4) { for (i = 0; i < avctx->width; i += 4) { @@ -115,7 +115,7 @@ static int txd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } break; case TXD_DXT3: - if (bytestream2_get_bytes_left(&gb) < FF_CEIL_RSHIFT(w, 2) * FF_CEIL_RSHIFT(h, 2) * 16) + if (bytestream2_get_bytes_left(&gb) < AV_CEIL_RSHIFT(w, 2) * AV_CEIL_RSHIFT(h, 2) * 16) return AVERROR_INVALIDDATA; for (j = 0; j < avctx->height; j += 4) { for (i = 0; i < avctx->width; i += 4) { |