merge so

zhangmeng

2019-07-19 e6725cb3cf4ced3a6985d4d3db4d5cf1336a30d8

 csrc/ffmpeg/property/VideoProp.hpp

@@ -39,7 +39,8 @@
      int          udp_port_y_;

      bool          gpu_acc_;
        
        int          gpu_index_;
		
        AVRational      sample_aspect_ratio_;

   };