[FFmpeg-devel] ARM CONFIG_SMALL patch lost

[Michael Niedermayer]

On Thu, Jul 19, 2012 at 01:43:20PM +0100, Gavin Kinsey wrote:
> Commit 2942431a0f94ecb77744a772c164ab71711ffe19 "arm/intmath: disable 
> av_clip_uintp2_arm with config_small" seems to have been reverted.  I can't 
> see any commits in the log that remove it but the code is no longer there in 
> my checkout (I did a fresh clone to be sure).
> 
> I guess it got lost in the 86e107a7d468666189506d3edd4f4b5ca14cd59e merge 
> somehow and my "git log -p" command isn't showing the actual patch due to it 
> being a merge?
> 
> Doing a "git cherry-pick 2942431a0f94ecb77744a772c164ab71711ffe19" works for 
> me to re-apply it.

the patch is not correct after the merge anymore nor should it be
needed, is there some problem with the current git head ?

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The educated differ from the uneducated as much as the living from the
dead. -- Aristotle 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120719/97eda226/attachment.asc>