git.osdn.net Git - android-x86/external-ffmpeg.git/commit

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 24 Feb 2015 23:03:52 +0000 (00:03 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 24 Feb 2015 23:03:52 +0000 (00:03 +0100)
commit	d52bf89d21b744344cf6cda1bfe156786f24772a
tree	25cfd43e57273d606a09be92a020650f16f206c6	tree \| snapshot
parent	99c76902cdc3f815d58ba16ccfc83e75acec1f4a	commit \| diff
parent	78791c086bcaf9eb084c27555b31fea8bbb7624a	commit \| diff

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>

external/ffmpeg

About OSDN

Find Software

Develop Software

Help