Changeset d52bf89d in ffmpeg

Timestamp:

Feb 24, 2015, 11:03:52 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f966ac2b

Parents:

99c76902 (diff), 78791c0 (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.

Message:

Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'

• commit '78791c086bcaf9eb084c27555b31fea8bbb7624a': rtpdec: Use .init instead of .alloc to set default values

Conflicts:

libavformat/rdt.c

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

(No files)