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>
Showing
- configure 29 additions, 15 deletionsconfigure
- libavcodec/dfa.c 1 addition, 1 deletionlibavcodec/dfa.c
- libavcodec/eatgv.c 1 addition, 1 deletionlibavcodec/eatgv.c
- libavcodec/g723_1.c 1 addition, 1 deletionlibavcodec/g723_1.c
- libavcodec/lcldec.c 1 addition, 1 deletionlibavcodec/lcldec.c
- libavcodec/wmavoice.c 1 addition, 1 deletionlibavcodec/wmavoice.c
- libavcodec/xan.c 1 addition, 2 deletionslibavcodec/xan.c
- libavcodec/xxan.c 1 addition, 2 deletionslibavcodec/xxan.c
- libavformat/matroskadec.c 7 additions, 2 deletionslibavformat/matroskadec.c
- libavformat/smoothstreamingenc.c 6 additions, 3 deletionslibavformat/smoothstreamingenc.c
- libavutil/Makefile 3 additions, 2 deletionslibavutil/Makefile
- libavutil/lzo.c 1 addition, 43 deletionslibavutil/lzo.c
- libavutil/lzo.h 0 additions, 11 deletionslibavutil/lzo.h
- libavutil/mem.c 37 additions, 0 deletionslibavutil/mem.c
- libavutil/mem.h 12 additions, 0 deletionslibavutil/mem.h
Loading
Please register or sign in to comment