[FFmpeg-cvslog] Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 15 04:37:17 2011 +0200| [85b21147594101ba2d8e7ea2cfa504c0d1baee5a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=85b21147594101ba2d8e7ea2cfa504c0d1baee5a
---