Changeset 1ace789f in ffmpeg

Timestamp:

May 5, 2015, 8:57:46 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e31cdb5c

Parents:

ff849e11 (diff), 60f1cc4a (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> (05/05/15 20:57:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/05/15 20:57:46)

Message:

Merge commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818'

• commit '60f1cc4a1ffcbf24acbb543988ceeaec76b70818': alsdec: only adapt order for positive max_order

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

(No files)