From 35685a3c2a1ec09f3c62dcfc4368fe9e92bcddf6 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 7 Feb 2013 21:43:58 +0100
Subject: [PATCH] dsputil: Move ff_shrink* function declarations to separate
 header

---
 libavcodec/dsputil.c    |  1 +
 libavcodec/dsputil.h    |  5 -----
 libavcodec/imgconvert.c |  1 +
 libavcodec/imgconvert.h | 29 +++++++++++++++++++++++++++++
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 libavcodec/imgconvert.h

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 2980684c64..9015d9dd65 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -34,6 +34,7 @@
 #include "simple_idct.h"
 #include "faandct.h"
 #include "faanidct.h"
+#include "imgconvert.h"
 #include "mathops.h"
 #include "mpegvideo.h"
 #include "config.h"
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index aadb9a811a..04f8165caa 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -84,11 +84,6 @@ void ff_avg_rv40_qpel16_mc33_c(uint8_t *dst, uint8_t *src, int stride);
 void ff_put_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride);
 void ff_avg_rv40_qpel8_mc33_c(uint8_t *dst, uint8_t *src, int stride);
 
-/* 1/2^n downscaling functions from imgconvert.c */
-void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
-void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
-void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
-
 void ff_gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
               int dxx, int dxy, int dyx, int dyy, int shift, int r, int width, int height);
 
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index ff4236e649..36c24dfa88 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
+#include "imgconvert.h"
 #include "internal.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/common.h"
diff --git a/libavcodec/imgconvert.h b/libavcodec/imgconvert.h
new file mode 100644
index 0000000000..91e9f91244
--- /dev/null
+++ b/libavcodec/imgconvert.h
@@ -0,0 +1,29 @@
+/*
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * Libav is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Libav; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVCODEC_IMGCONVERT_H
+#define AVCODEC_IMGCONVERT_H
+
+#include <stdint.h>
+
+/* 1/2^n downscaling functions */
+void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+
+#endif /* AVCODEC_IMGCONVERT_H */