On branch dev-butterknife-recorder-helper
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	new file:   src/com/qd/recorder/helper/RecorderHelper.java
 On branch dev-butterknife-recorder-camera-helper
 Changes to be committed: add camera warpper.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	new file:   src/com/qd/recorder/helper/CameraWrapper.java
 On branch dev-butterknife-recorder-camera-helper
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/CameraWrapper.java
 On branch dev-reform
 Changes to be committed: refine display metric
	modified:   src/com/qd/recorder/FFmpegPreviewActivity.java
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/ProgressView.java
	modified:   src/com/qd/recorder/helper/RuntimeHelper.java
 On branch dev-reform
 Changes to be committed: reform display size calculation.
	modified:   src/com/qd/recorder/BaseInjectActivity.java
	modified:   src/com/qd/recorder/FFmpegPreviewActivity.java
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/ProgressView.java
	modified:   src/com/qd/recorder/helper/CameraWrapper.java
	modified:   src/com/qd/recorder/helper/RuntimeHelper.java
 On branch dev-reform
 Changes to be committed: camera status reform.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/Util.java
	modified:   src/com/qd/recorder/helper/CameraWrapper.java
 On branch dev-reform
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegPreviewActivity.java
 On branch dev-reform-minor
 Changes to be committed: preview operation wrapper.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/CameraWrapper.java
 On branch dev-reform-minor
 Changes to be committed: wrap flash mode.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/CameraWrapper.java
 On branch dev-reform-minor
 Changes to be committed: resolution reform.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/Util.java
 On branch dev-reform-minor
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/RecorderHelper.java
 On branch dev-reform-minor
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/RecorderHelper.java
 On branch dev-reform-minor-lost-1st-frame
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/RecorderHelper.java
 On branch dev-reform-minor-lost-1st-frame
 Changes to be committed: wrap frame rate.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
	modified:   src/com/qd/recorder/helper/RecorderHelper.java
 On branch dev-reform-minor-lost-1st-frame
 Changes to be committed: fix 1st frame show.
	modified:   src/com/qd/recorder/FFmpegRecorderActivity.java
 On branch dev-reform-watermark
 Changes to be committed:
	modified:   src/com/qd/recorder/FFmpegEffectActivity.java
	modified:   src/com/qd/recorder/FFmpegPreviewActivity.java
	modified:   src/com/qd/recorder/Util.java
	new file:   src/com/qd/recorder/helper/BitmapHelper.java
	new file:   src/com/qd/recorder/helper/ImageProcessor.java
 On branch master
 Changes to be committed: update code to javacv/javacpp 0.10 from github.com/bytedeco
Merge branch 'master' into dev-butterknife

Conflicts:
	src/com/qd/recorder/FFmpegRecorderActivity.java
Merge branch 'dev-butterknife' into dev-reform-ex

Conflicts:
	src/com/qd/recorder/FFmpegRecorderActivity.java
	src/com/qd/recorder/Util.java
 On branch dev-reform-ex
 Changes to be committed: add process.
	new file:   libs/armeabi/libjniopencv_highgui.so
	new file:   libs/armeabi/libopencv_highgui.so
	modified:   src/com/qd/recorder/FFmpegEffectActivity.java
	modified:   src/com/qd/recorder/Util.java