OSDN Git Service

Merge branch 'lollipop-x86' into multiwindow-hwaccel
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
commit84eca1825c3971489fa21389a565f0cf6a1e2555
tree52c90359e544964dada55035f62530976ed7c206
parent18410a56fad1ca161af1038deb6b7e1d479bc67c
parent797e00145e8f442129fcf044c23db9af08e40b12
Merge branch 'lollipop-x86' into multiwindow-hwaccel
data/media_codecs_ffmpeg.xml
extractor/FFmpegExtractor.cpp
omx/SoftFFmpegAudio.cpp
omx/SoftFFmpegVideo.cpp
utils/codec_utils.cpp
utils/ffmpeg_source.cpp