diff options
| author | Lida Wang <lidaw@codeaurora.org> | 2016-04-29 23:03:54 -0700 |
|---|---|---|
| committer | Lida Wang <lidaw@codeaurora.org> | 2016-04-30 09:46:25 -0700 |
| commit | 77249ce0c5fda9ac0e18486199e47a5f715ef099 (patch) | |
| tree | dc9c0e4df3fa8684117448e42df19cddbaa77e37 /src/com/android/camera/CameraSettings.java | |
| parent | ae3088c753f96a2f5c6c9bcdeaeda78114d85024 (diff) | |
| download | android_packages_apps_Snap-77249ce0c5fda9ac0e18486199e47a5f715ef099.tar.gz android_packages_apps_Snap-77249ce0c5fda9ac0e18486199e47a5f715ef099.tar.bz2 android_packages_apps_Snap-77249ce0c5fda9ac0e18486199e47a5f715ef099.zip | |
SnapdragonCamera: Temp fix to make both M and N compile
Temp fix to make app compile on both Android M and N
CRs-fixed: 1007835
Change-Id: Ia3abac6d157b8e52d0998733e0a2dfbe194e0e94
Diffstat (limited to 'src/com/android/camera/CameraSettings.java')
| -rw-r--r-- | src/com/android/camera/CameraSettings.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CameraSettings.java b/src/com/android/camera/CameraSettings.java index 5ce385844..a12ce5de0 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.H265, "h265"); VIDEO_ENCODER_TABLE.put(MediaRecorder.VideoEncoder.MPEG_4_SP, "m4v"); //video qualities |