Changeset 24

Show
Ignore:
Timestamp:
02/28/08 04:17:57 (9 months ago)
Author:
kaarna
Message:

Renamed old 003 source to src_old. New code in the next commit.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/pihlaja/AUTHORS

    r20 r24  
    66Code: 
    77Jonas Kivi <satelliittipupu@y????.co.uk> 
    8 (discoverer.d, smartvideoscale.d: mostly, and project.d: some encoding parts,  
    9 converted from PiTiVi python source by Edward Hervey) 
    108(RTree code based on a Java implementation by Marios Hadjieleftheriou) 
    119 
  • trunk/pihlaja/COPYING

    r13 r24  
     1NOTE: There is a license exception at the bottom of this document. 
     2 
     3 
    14            GNU GENERAL PUBLIC LICENSE 
    25               Version 2, June 1991 
     
    342345Public License instead of this License. 
    343346 
    344 LICENCE EXCEPTION: 
     347 
     348PIHLAJA NON-GPL PLUGINS LICENCE EXCEPTION: 
    345349 
    346350The Pihlaja project hereby grants permission for non-GPL compatible 
    347 GStreamer plugins to be used and distributed together with GStreamer 
    348 and Pihlaja. This permission is above and beyond the permissions 
    349 granted by the GPL license by which Pihlaja is covered. If you 
    350 modify this code, you may extend this exception to your version of the 
    351 code, but you are not obligated to do so. If you do not wish to do so, 
    352 delete this exception statement from your version. 
     351video/audio plugins to be used and distributed together with Pihlaja. 
     352(The video and/or audio plugins is defined here as plugins that do  
     353video and audio filtering, but are not adding significant user  
     354interface tools, other than those needed to control the filtering,  
     355and are not modifying the Pihlaja user interface. Complete non-GPL  
     356compatible compositing or 3D sub-environments as plugins are not  
     357allowed.) 
     358This permission is above and beyond the permissions granted by  
     359the GPL license by which Pihlaja is covered. If you modify this code,  
     360you may extend this exception to your version of the code, but you  
     361are not obligated to do so. If you do not wish to do so, delete  
     362this exception statement from your version.