Changeset 5a55d5e4 in ffmpeg

Timestamp:

Jun 26, 2014, 9:22:08 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

877716a7

Parents:

b9bfd888 (diff), 63fd0d86 (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 21:20:54)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/26/14 21:22:08)

Message:

Merge commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb'

• commit '63fd0d866c8300a8f251a15b1535e9ce40a407fb': output example: allocate the audio frame only once

Conflicts:

doc/examples/muxing.c

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

(No files)