Changeset 85b21147 in ffmpeg

Timestamp:

Apr 15, 2011, 2:50:06 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7c8c55ff

Parents:

256c5b08 (diff), a3a0af4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/15/11 02:37:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/15/11 02:50:06)

Message:

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>

(No files)