aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-06 23:07:42 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-11-10 00:39:43 +0100
commita7a783a5c5115e338b0ad2f4321cef9ddffa825b (patch)
tree6fabecc8442ab3cbb9957873a237bb658681bf62
parent4e6ca99c3682851979a51e1fdf03fae1dd88e52d (diff)
downloadffmpeg-a7a783a5c5115e338b0ad2f4321cef9ddffa825b.tar.gz
avcodec/clearvideo: Move tile_do_block() upwards
Will avoid a forward-declaration later. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/clearvideo.c28
1 files 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)