OSDN Git Service

Merge remote-tracking branch 'x86/oreo-x86' into pie-x86 pie-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 19 Nov 2020 16:05:31 +0000 (00:05 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 19 Nov 2020 16:05:31 +0000 (00:05 +0800)
1  2 
omx/SoftFFmpegVideo.cpp

Simple merge