Changeset 5d06b6e9 in ffmpeg

Timestamp:

Feb 24, 2015, 9:11:58 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ae2a8d87

Parents:

eb24186b (diff), fe414059 (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> (02/24/15 21:11:54)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/24/15 21:11:58)

Message:

Merge commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b'

• commit 'fe414059ec1fe8237574bed34cdaa8ac3893917b': rtpdec_amr: Use the common indentation style

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

(No files)