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

(root) / android-x86 / external-ffmpeg.git / commit

author	Michael Niedermayer <michaelni@gmx.at>
	Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)
committer	Michael Niedermayer <michaelni@gmx.at>
	Thu, 18 Oct 2012 10:16:08 +0000 (12:16 +0200)
commit	3777e6b3bf65be9a925187a9d008c5d422fe17b5
tree	6ab9a542129dd1bb6ac4ff6b572d714d1dba40c3	tree \| snapshot
parent	9317b73f11c34e550a2ffcf01540824dbaa36036	commit \| diff
parent	b93e934aeea44f3e92f0acd960e5d10151f14379	commit \| diff

Merge remote-tracking branch 'qatar/master'

* qatar/master:
mips64: mark hi/lo registers clobbered in MAC64/MLS64 macros
fate: list lavfi tests in a makefile

Conflicts:
configure
tests/Makefile

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

configure	diff1 \|	diff2 \|	blob \| history
libavcodec/mips/mathops.h	diff1 \|	diff2 \|	blob \| history
tests/Makefile	diff1 \|	diff2 \|	blob \| history
tests/fate/avfilter.mak	\|	diff2 \|	blob \| history

external/ffmpeg

RSS Atom

About OSDN

Find Software

Develop Software

Help

configure	diff1 \|	diff2 \|	blob \| history
libavcodec/mips/mathops.h	diff1 \|	diff2 \|	blob \| history
tests/Makefile	diff1 \|	diff2 \|	blob \| history
tests/fate/avfilter.mak	\|	diff2 \|	blob \| history