image_writer: move convert_image() to player/screenshot.c

3 files changed, 4 insertions, 10 deletions

diff --git a/video/image_loader.c b/video/image_loader.c
index 9efc8b7310..77deea0f8d 100644
--- a/video/image_loader.c
+++ b/video/image_loader.c
@@ -2,7 +2,7 @@
 
 #include "common/common.h"
 #include "mp_image.h"
-#include "image_writer.h"
+#include "player/screenshot.h"
 
 #include "image_loader.h"
 
diff --git a/video/image_writer.c b/video/image_writer.c
index 6a092aa17f..347adb350a 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -18,7 +18,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <setjmp.h>
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/mem.h>
@@ -27,6 +26,7 @@
 #include "config.h"
 
 #if HAVE_JPEG
+#include <setjmp.h>
 #include <jpeglib.h>
 #endif
 
@@ -291,8 +291,8 @@ int image_writer_format_from_ext(const char *ext)
     return 0;
 }
 
-struct mp_image *convert_image(struct mp_image *image, int destfmt,
-                               struct mp_log *log)
+static struct mp_image *convert_image(struct mp_image *image, int destfmt,
+                                      struct mp_log *log)
 {
     int d_w, d_h;
     mp_image_params_get_dsize(&image->params, &d_w, &d_h);
diff --git a/video/image_writer.h b/video/image_writer.h
index 98cb95a898..c9932e93ee 100644
--- a/video/image_writer.h
+++ b/video/image_writer.h
@@ -61,11 +61,5 @@ int image_writer_format_from_ext(const char *ext);
 bool write_image(struct mp_image *image, const struct image_writer_opts *opts,
                  const char *filename, struct mp_log *log);
 
-/* Return the image converted to the given format. If the pixel aspect ratio is
- * not 1:1, the image is scaled as well. Returns NULL on failure.
- */
-struct mp_image *convert_image(struct mp_image *image, int destfmt,
-                               struct mp_log *log);
-
 // Debugging helper.
 void dump_png(struct mp_image *image, const char *filename, struct mp_log *log);