Michael Niedermayer 85b2114759 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>

2011-04-15 04:50:06 +02:00

2.7 KiB

Raw Blame History

View Raw