• Michael Niedermayer's avatar
    Merge commit 'e002e329' · f391e405
    Michael Niedermayer authored
    * commit 'e002e329
    
    ':
      Use the new aes/md5/sha/tree allocation functions
      avutil: Add functions for allocating opaque contexts for algorithms
      svq3: fix pointer type warning
      svq3: replace unsafe pointer casting with intreadwrite macros
      parseutils-test: various cleanups
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/svq3.c
    	libavutil/parseutils.c
    	libavutil/version.h
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    f391e405