Merge branch 'lollipop-x86' into multiwindow-hwaccel

author Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)

committer Chih-Wei Huang <cwhuang@linux.org.tw>

Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
author Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
committer Chih-Wei Huang <cwhuang@linux.org.tw>
Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
diff --cc data/media_codecs_ffmpeg.xml
Simple merge
diff --cc extractor/FFmpegExtractor.cpp
Simple merge
diff --cc omx/SoftFFmpegAudio.cpp
Simple merge
diff --cc omx/SoftFFmpegVideo.cpp
Simple merge
diff --cc utils/codec_utils.cpp
Simple merge
diff --cc utils/ffmpeg_source.cpp
Simple merge
author	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
committer	Chih-Wei Huang <cwhuang@linux.org.tw>
	Fri, 28 Apr 2017 04:41:46 +0000 (12:41 +0800)
		1	2
data/media_codecs_ffmpeg.xml	patch \|	diff1 \|	diff2 \|	blob \| history
extractor/FFmpegExtractor.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
omx/SoftFFmpegAudio.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
omx/SoftFFmpegVideo.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
utils/codec_utils.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
utils/ffmpeg_source.cpp	patch \|	diff1 \|	diff2 \|	blob \| history