diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-18 19:27:51 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-10-25 11:36:57 +0200 |
| commit | 5bac2d0c3020587a03cb14e8b6a664a0b92f26c2 (patch) | |
| tree | 08c6ccffd567aabf43301cc5d3dee357580d3eed /libavcodec | |
| parent | a6e9d6497739b7b60e3284f03b27883514bbc94a (diff) | |
| download | ffmpeg-5bac2d0c3020587a03cb14e8b6a664a0b92f26c2.tar.gz | |
avutil: Move memcpy_backptr() to mem.c
The function is used elsewhere and does not belong with the LZO code.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/dfa.c | 2 | ||||
| -rw-r--r-- | libavcodec/eatgv.c | 2 | ||||
| -rw-r--r-- | libavcodec/g723_1.c | 2 | ||||
| -rw-r--r-- | libavcodec/lcldec.c | 2 | ||||
| -rw-r--r-- | libavcodec/wmavoice.c | 2 | ||||
| -rw-r--r-- | libavcodec/xan.c | 3 | ||||
| -rw-r--r-- | libavcodec/xxan.c | 3 |
7 files changed, 7 insertions, 9 deletions
diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index ae184d7b5f..1598f47c6c 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -24,7 +24,7 @@ #include "bytestream.h" #include "libavutil/imgutils.h" -#include "libavutil/lzo.h" // for av_memcpy_backptr +#include "libavutil/mem.h" typedef struct DfaContext { AVFrame pic; diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c index 404238b6ef..170eeb10d5 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_SIZE 8 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T') diff --git a/libavcodec/g723_1.c b/libavcodec/g723_1.c index 5c213da64c..342c63473d 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 6b101ae6d1..c80d0fe30e 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -41,10 +41,10 @@ #include <stdio.h> #include <stdlib.h> +#include "libavutil/mem.h" #include "avcodec.h" #include "bytestream.h" #include "lcl.h" -#include "libavutil/lzo.h" #if CONFIG_ZLIB_DECODER #include <zlib.h> diff --git a/libavcodec/wmavoice.c b/libavcodec/wmavoice.c index 63caad2440..466d1ec495 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 586320b55e..e6bfc0da06 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 b06d314d0f..2a5a8ca631 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; |