Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Apr 2011 02:37:17 +0000 (04:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 15 Apr 2011 02:50:06 +0000 (04:50 +0200)
commit85b21147594101ba2d8e7ea2cfa504c0d1baee5a
tree62927788e459965cea1ff4cd23c219fcf0410b0e
parent256c5b08bf09cb6403790d731cc1c771d8fb0e94
parenta3a0af4fb1237bed0af75868073f9a63db8b1864
Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'

* commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864':
  avutil: make aes and sha api public
  handle malloc failures in ff_get_wav_header
  add xWMA demuxer
  mpegts: force the default timebase
  libavcodec: Bump micro after adding the dtx AVOptions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
17 files changed:
Changelog
doc/general.texi
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavformat/Makefile
libavformat/allformats.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mpegtsenc.c
libavformat/riff.c
libavformat/riff.h
libavformat/version.h
libavformat/wav.c
libavformat/wtv.c
libavformat/xwma.c