Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 11:15:58 +0000 (13:15 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 11:15:58 +0000 (13:15 +0200)
commitaa604e8e33ae06f3a106e44fff798fdd70d77230
treede1f5670244e74d90e97b8dc69f054768c363959
parentd312ffdd79bd22b5a051790c993eda6b1366cdfc
parent2a91ada8282f18d2807abee5188225bba1b19bda
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>
15 files changed:
configure
libavcodec/dfa.c
libavcodec/eatgv.c
libavcodec/g723_1.c
libavcodec/lcldec.c
libavcodec/wmavoice.c
libavcodec/xan.c
libavcodec/xxan.c
libavformat/matroskadec.c
libavformat/smoothstreamingenc.c
libavutil/Makefile
libavutil/lzo.c
libavutil/lzo.h
libavutil/mem.c
libavutil/mem.h