OSDN Git Service

Merge branch 'jide_x86_lollipop' into lollipop-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 25 Apr 2017 09:13:23 +0000 (17:13 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 25 Apr 2017 09:13:23 +0000 (17:13 +0800)
commit797e00145e8f442129fcf044c23db9af08e40b12
tree06f7229b176b2bf94bc6fb39f61fdbd8b8365e25
parent8f1521a5fa9a8f1ffe9d82a53dba8f91ad5672ed
parent09d72f4acc3ddfbb62eb52ad567f5632194be723
Merge branch 'jide_x86_lollipop' into lollipop-x86
extractor/FFmpegExtractor.cpp
omx/SoftFFmpegAudio.cpp
omx/SoftFFmpegVideo.cpp
utils/codec_utils.cpp
utils/ffmpeg_source.cpp
utils/ffmpeg_utils.cpp