The function is used elsewhere and does not belong with the LZO code.
---
libavcodec/dfa.c |3 ++-
libavcodec/eatgv.c|2 +-
libavcodec/g723_1.c |2 +-
libavcodec/lcldec.c |1 +
libavcodec/wmavoice.c |2 +-
libavcodec/xan.c |3 +--
libavcodec/xxan.c |3 +--
libavutil/lzo.c | 45 ++---
libavutil/lzo.h | 11 ---
libavutil/mem.c | 40
libavutil/mem.h | 12
11 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c
index 39f0f64..fb751f6 100644
--- a/libavcodec/dfa.c
+++ b/libavcodec/dfa.c
@@ -24,7 +24,8 @@
#include bytestream.h
#include libavutil/imgutils.h
-#include libavutil/lzo.h // for av_memcpy_backptr
+#include libavutil/lzo.h
+#include libavutil/mem.h
typedef struct DfaContext {
AVFrame pic;
diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index b29c994..3f1bfce 100644
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -31,8 +31,8 @@
#include avcodec.h
#define BITSTREAM_READER_LE
#include get_bits.h
-#include libavutil/lzo.h
#include libavutil/imgutils.h
+#include libavutil/mem.h
#define EA_PREAMBLE_SIZE8
#define kVGT_TAG MKTAG('k', 'V', 'G', 'T')
diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c
index 3d4fa46..cfdfd0f 100644
--- a/libavcodec/g723_1.c
+++ b/libavcodec/g723_1.c
@@ -27,7 +27,7 @@
#define BITSTREAM_READER_LE
#include libavutil/audioconvert.h
-#include libavutil/lzo.h
+#include libavutil/mem.h
#include libavutil/opt.h
#include avcodec.h
#include get_bits.h
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 0de7410..855e1b1 100644
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -45,6 +45,7 @@
#include bytestream.h
#include lcl.h
#include libavutil/lzo.h
+#include libavutil/mem.h
#if CONFIG_ZLIB_DECODER
#include zlib.h
diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c
index 2ed79a6..41ec194 100644
--- a/libavcodec/wmavoice.c
+++ b/libavcodec/wmavoice.c
@@ -29,6 +29,7 @@
#include math.h
+#include libavutil/mem.h
#include dsputil.h
#include avcodec.h
#include get_bits.h
@@ -38,7 +39,6 @@
#include acelp_vectors.h
#include acelp_filters.h
#include lsp.h
-#include libavutil/lzo.h
#include dct.h
#include rdft.h
#include sinewin.h
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 586320b..e6bfc0d 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -33,12 +33,11 @@
#include string.h
#include libavutil/intreadwrite.h
+#include libavutil/mem.h
#include avcodec.h
#include bytestream.h
#define BITSTREAM_READER_LE
#include get_bits.h
-// for av_memcpy_backptr
-#include libavutil/lzo.h
#define RUNTIME_GAMMA 0
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index b06d314..2a5a8ca 100644
--- a/libavcodec/xxan.c
+++ b/libavcodec/xxan.c
@@ -22,11 +22,10 @@
#include avcodec.h
#include libavutil/intreadwrite.h
+#include libavutil/mem.h
#include bytestream.h
#define BITSTREAM_READER_LE
#include get_bits.h
-// for av_memcpy_backptr
-#include libavutil/lzo.h
typedef struct XanContext {
AVCodecContext *avctx;
diff --git a/libavutil/lzo.c b/libavutil/lzo.c
index a7fddc5..cdd3624 100644
--- a/libavutil/lzo.c
+++ b/libavutil/lzo.c
@@ -19,6 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include stdint.h
#include string.h
#include avutil.h
@@ -100,8 +101,6 @@ static inline void copy(LZOContext *c, int cnt)
c-out = dst + cnt;
}
-static inline void memcpy_backptr(uint8_t *dst, int back, int cnt);
-
/**
* @brief Copies previously decoded bytes to current position.
* @param back how many bytes back we start
@@ -122,50 +121,10 @@ static inline void copy_backptr(LZOContext *c, int back,
int cnt)
cnt = FFMAX(c-out_end - dst, 0);
c-error |= AV_LZO_OUTPUT_FULL;
}
-memcpy_backptr(dst, back, cnt);
+av_memcpy_backptr(dst, back, cnt);
c-out = dst + cnt;
}
-static inline void memcpy_backptr(uint8_t *dst, int back, int cnt)
-{
-const uint8_t *src = dst[-back];
-if (back == 1) {
-memset(dst, *src, cnt);
-} else {
-#ifdef OUTBUF_PADDED
-AV_COPY16(dst, src);
-AV_COPY16(dst + 2, src + 2);
-src += 4;
-dst += 4;
-cnt -= 4;
-if (cnt 0) {
-AV_COPY16(dst, src);
-AV_COPY16(dst + 2, src + 2);
-AV_COPY16(dst + 4, src + 4);
-AV_COPY16(dst + 6, src + 6);
-src += 8;
-dst += 8;
-cnt -= 8;
-}
-#endif
-if (cnt 0) {
-int blocklen = back;
-while (cnt blocklen) {
-memcpy(dst, src, blocklen);
-dst += blocklen;
-cnt -= blocklen;
-blocklen = 1;
-}
-memcpy(dst, src, cnt);
-}
-}
-}
-
-void
