added rtsp library to classpath
made extra space black when rendering an image that is not the same size as the frame
Implement crypto provider and GFE 2.1 compatibility
Merge from upstream