From 803388b511d31b9e25f6829298bb12e06323474c Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 17 七月 2019 13:37:47 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

---
 csrc/ffmpeg/property/VideoProp.hpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/csrc/ffmpeg/property/VideoProp.hpp b/csrc/ffmpeg/property/VideoProp.hpp
index c3cbd78..a1f5561 100644
--- a/csrc/ffmpeg/property/VideoProp.hpp
+++ b/csrc/ffmpeg/property/VideoProp.hpp
@@ -39,7 +39,8 @@
 		int 			udp_port_y_;
 
 		bool 			gpu_acc_;
-        
+        int 			gpu_index_;
+		
         AVRational      sample_aspect_ratio_;
 
 	};

--
Gitblit v1.8.0