libav.git - [no description]

	Commit message (Collapse)	Author	Age
*	Merge commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49'	Michael Niedermayer	2014-01-14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	* commit '7151c5d04aed3b496c21f713dcb603e2cbdb9c49': arm: Use full filenames as multiple inclusion guards Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	arm: Use full filenames as multiple inclusion guards	Diego Biurrun	2014-01-14
\| \|
* \|	Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'	Michael Niedermayer	2013-04-20
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb': arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/arm/Makefile libavcodec/arm/hpeldsp_arm.S libavcodec/arm/hpeldsp_arm.h libavcodec/arm/hpeldsp_armv6.S libavcodec/arm/hpeldsp_init_arm.c libavcodec/arm/hpeldsp_init_armv6.c libavcodec/arm/hpeldsp_init_neon.c libavcodec/arm/hpeldsp_neon.S libavcodec/hpeldsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
\| *	arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp	Ronald S. Bultje	2013-04-19
\| \| \| \|	Signed-off-by: Martin Storsjö <martin@martin.st>
*	Move arm half-pel assembly from dsputil to hpeldsp.	Ronald S. Bultje	2013-03-13