summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/CameraSettings.java
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-05-31 14:53:29 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-05-31 14:53:29 -0700
commitdba00aac4e44a91bc55b0aabca9f191d03994edf (patch)
tree7d468658ca6a9f7a32de215ac4fb1666f5b34e09 /src/com/android/camera/CameraSettings.java
parente8d4ba774d224e5076576ba4c29d1fc248456b40 (diff)
downloadandroid_packages_apps_Snap-dba00aac4e44a91bc55b0aabca9f191d03994edf.tar.gz
android_packages_apps_Snap-dba00aac4e44a91bc55b0aabca9f191d03994edf.tar.bz2
android_packages_apps_Snap-dba00aac4e44a91bc55b0aabca9f191d03994edf.zip
Revert "Revert "SnapdragonCamera: Update encoder from H265 to HEVC""
Resinstating Change-Id: Ib17de6f778166f3a7cb7b8e403a9b3c7fb0b3f0c CRs-fixed: 1015477 This reverts commit e8d4ba774d224e5076576ba4c29d1fc248456b40 Change-Id: I9dd2dc05068e73edd9bad617480cff5c77015b58
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
-rw-r--r--src/com/android/camera/CameraSettings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java
index a12ce5de0..acf0f135b 100644
--- a/src/com/android/camera/CameraSettings.java
+++ b/src/com/android/camera/CameraSettings.java
@@ -282,7 +282,7 @@ public class CameraSettings {
//video encoders
VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H263, "h263");
VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H264, "h264");
- // VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.H265, "h265");
+ VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.HEVC, "h265");
VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.MPEG_4_SP, "m4v");
//video qualities