« Previous | Next » 

Revision 85b21147

ID85b21147594101ba2d8e7ea2cfa504c0d1baee5a
Parent 256c5b08, a3a0af4f
Child 7c8c55ff

Added by Michael Niedermayer over 9 years ago

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 <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted