OSDN Git Service

Merge remote-tracking branch 'los/cm-14.1' into nougat-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 23 Aug 2017 16:03:28 +0000 (00:03 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 23 Aug 2017 16:03:28 +0000 (00:03 +0800)
1  2 
extractor/FFmpegExtractor.cpp

Simple merge