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/xxan.c | |
| 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/xxan.c')
| -rw-r--r-- | libavcodec/xxan.c | 3 |
1 files changed, 1 insertions, 2 deletions
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; |