Merge branch 'torchvision_video_reader' of github.com:stephenyan1231/vision into torchvision_video_reader

Author: zyan3

torchvision/csrc/cpu/video_reader/VideoReader.h

@@ -4,6 +4,7 @@
 
 // Interface for Python
 
+<<<<<<< HEAD
 /*
   return:
     videoFrame: tensor (N, H, W, C) kByte
@@ -15,6 +16,8 @@
     audioTimeBase: tensor (2) kInt
     audioSampleRate: tensor (1) kInt
 */
+=======
+>>>>>>> 38c0e753cf22326e10bfb992bce70bff95059253
 torch::List<torch::Tensor> readVideoFromMemory(
     // 1D tensor of data type uint8, storing the comparessed video data
     torch::Tensor input_video,
@@ -71,7 +74,10 @@ torch::List<torch::Tensor> readVideoFromMemory(
     int64_t audioTimeBaseNum,
     int64_t audioTimeBaseDen);
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 38c0e753cf22326e10bfb992bce70bff95059253
 torch::List<torch::Tensor> readVideoFromFile(
     std::string videoPath,
     double seekFrameMargin,