Michael Niedermayer d52bf89d21 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>

2015-02-25 00:03:52 +01:00

6.6 KiB

Raw Blame History

View Raw