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

author	Michael Niedermayer <michaelni@gmx.at>
	Tue, 26 Nov 2013 12:00:46 +0000 (13:00 +0100)
committer	Michael Niedermayer <michaelni@gmx.at>
	Tue, 26 Nov 2013 12:00:46 +0000 (13:00 +0100)
commit	625b29037e52bf46c15a7a1fccc83f6ef1647225
tree	3e492b6020a30f0c2f77aa548663de2000cb19e0	tree \| snapshot
parent	cd51d9a98403a97c0ec1a2a57337193d489a5096	commit \| diff
parent	1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025	commit \| diff

Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'

* commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025':
mpeg12dec: Extract CC user data into frame side data

Conflicts:
doc/APIchanges
libavutil/version.h

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

external/ffmpeg

About OSDN

Find Software

Develop Software

Help