1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-14 22:22:59 +02:00
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
..
2011-04-14 03:21:38 +02:00
2011-04-13 10:01:14 +02:00
2011-04-10 10:07:49 +02:00
2011-04-10 09:27:50 +02:00
2011-04-13 10:06:27 +02:00
2011-04-11 00:14:21 +02:00
2011-04-10 04:31:54 +02:00
2011-01-30 03:41:47 +01:00