Changeset d2a5c6f in ffmpeg

Timestamp:

Feb 24, 2015, 10:44:25 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99c76902

Parents:

499da71 (diff), ec96a89c (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 22:44:20)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/24/15 22:44:25)

Message:

Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

• commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74': rtpdec: Don't pass non-const pointers to fmtp attribute parsing functions

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

(No files)