diff mbox series

[FFmpeg-devel,2/5] avcodec/clearvideo: Move tile_do_block() upwards

Message ID GV1P250MB07371009F5B48154457666218F3C9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM
State Accepted
Commit a7a783a5c5115e338b0ad2f4321cef9ddffa825b
Headers show
Series [FFmpeg-devel,1/5] avcodec/clearvideo: Remove unnecessary level parameter | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Andreas Rheinhardt Nov. 7, 2022, 1:49 a.m. UTC 
Will avoid a forward-declaration later.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/clearvideo.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)
diff mbox series

Patch

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)