From a7a783a5c5115e338b0ad2f4321cef9ddffa825b Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 6 Nov 2022 23:07:42 +0100 Subject: avcodec/clearvideo: Move tile_do_block() upwards Will avoid a forward-declaration later. Signed-off-by: Andreas Rheinhardt --- libavcodec/clearvideo.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 82311bc645..6ea3d7b6a2 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -362,6 +362,20 @@ static void mvi_update_row(MVInfo *mvi) } } +static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, + int plane, int x, int y, int dx, int dy, int size, int bias) +{ + int ret; + + if (!bias) { + ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size); + } else { + ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias); + } + + return ret; +} + static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) { TileInfo *ti; @@ -414,20 +428,6 @@ static TileInfo *decode_tile_info(GetBitContext *gb, const LevelCodes *lc) return ti; } -static int tile_do_block(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, - int plane, int x, int y, int dx, int dy, int size, int bias) -{ - int ret; - - if (!bias) { - ret = copy_block(avctx, dst, src, plane, x, y, dx, dy, size); - } else { - ret = copyadd_block(avctx, dst, src, plane, x, y, dx, dy, size, bias); - } - - return ret; -} - static int restore_tree(AVCodecContext *avctx, AVFrame *dst, AVFrame *src, int plane, int x, int y, int size, TileInfo *tile, MV root_mv) -- cgit v1.2.3