2 Commits

Author	SHA1	Message	Date
Raluca Munteanu	8674e2bfc8	Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) ... 125603 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125484 slanglois: MNT-16155 Update source headers - remove old Copyrights from Java and JSP dource files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125781 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2016-04-26 12:48:49 +00:00
Nick Burch	98ba89bed7	Provide example context files for using FFMPEG to provide video -> flv transformations, and video thumbnailing using FFMPEG ... These are based on the ones used on partners.alfresco.com, but slightly cleaned up Also includes a slightly nicer way to register thumbnail definitions to the thumbnail registry from spring. (A proper fix is detailed in ALF-5051, but that will require a config file tweak) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@22817 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261	2010-10-01 15:13:53 +00:00