diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 13:15:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-25 13:15:58 +0200 |
| commit | aa604e8e33ae06f3a106e44fff798fdd70d77230 (patch) | |
| tree | de1f5670244e74d90e97b8dc69f054768c363959 /libavcodec | |
| parent | d312ffdd79bd22b5a051790c993eda6b1366cdfc (diff) | |
| parent | 2a91ada8282f18d2807abee5188225bba1b19bda (diff) | |
| download | ffmpeg-aa604e8e33ae06f3a106e44fff798fdd70d77230.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Make LZO decoder code configure-time selectable
avutil: Move memcpy_backptr() to mem.c
configure: detect parisc64 automatically
configure: detect ppc64 automatically
configure: detect mips64 automatically
configure: generalise 64-bit test
smoothstreamingenc: Don't assume streams start from timestamp 0
Conflicts:
configure
libavutil/Makefile
libavutil/lzo.c
libavutil/lzo.h
libavutil/mem.c
libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
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 42c37c831f..548a649fa1 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -25,7 +25,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 c986c14e64..caee311cda 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 ae1707d155..a74c74da61 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 "internal.h" diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 475ffdd55a..b3b7b523f6 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 480c9edd50..9504dab3f1 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 f11f1bf062..25e62e66a2 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 7a7b5ba277..de1ea7f0e4 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; |