• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · aa604e8e
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    aa604e8e
dfa.c 12.3 KB