Changeset 642207d in ffmpeg

Timestamp:

Sep 4, 2013, 9:58:00 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

233ab0f0

Parents:

54d628a (diff), f7c58831 (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> (09/04/13 09:50:54)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/04/13 09:58:00)

Message:

Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c'

• commit 'f7c5883126f9440547933eefcf000aa78af4821c': alac: Limit max_samples_per_frame

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

(No files)