Changeset 11991a7d in ffmpeg

Timestamp:

Jun 26, 2014, 8:46:11 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b9bfd888

Parents:

a1c46355 (diff), 5e7b125b (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> (06/26/14 20:44:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/26/14 20:46:11)

Message:

Merge commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38'

• commit '5e7b125b6ae36893dfd9cb5661c99b67363cbb38': output example: use the new AVFrame API to allocate audio frames

Conflicts:

doc/examples/muxing.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)