Changeset 48e3cd4f in ffmpeg

Timestamp:

Feb 24, 2015, 9:42:04 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3804d73e

Parents:

11fb625 (diff), e72605f8 (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:42:00)

git-committer:

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

Message:

Merge commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd'

• commit 'e72605f80bf5cbe32053a554ccc137e0a99cf3dd': rtpdec: Allow allocating and freeing the private data without explicit functions

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

(No files)