Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:52:34 +0000 (14:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:52:34 +0000 (14:52 +0200)
commitf391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2
tree739e823660aa365a392c509acd1ac1686272029f
parentd6135a886d85bdbf271c55a238c3336670adc742
parente002e3291e6dc7953f843abf56fc14f08f238b21
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
  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: Michael Niedermayer <michaelni@gmx.at>
18 files changed:
doc/APIchanges
libavcodec/flacenc.c
libavcodec/svq3.c
libavformat/crypto.c
libavformat/httpauth.c
libavformat/mxfdec.c
libavformat/nut.c
libavformat/rtmpproto.c
libavutil/aes.c
libavutil/aes.h
libavutil/md5.c
libavutil/md5.h
libavutil/parseutils.c
libavutil/sha.c
libavutil/sha.h
libavutil/tree.c
libavutil/tree.h
libavutil/version.h