commit 445fd63a37a85fa696e278acad25bfd4dc20f843
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 21 05:40:46 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 21 05:40:47 2017 +0000
tree 840877d4db69fb29d50af40955db2ee34625b5d8
parent c690cad78f2e3d6791c28d305b234570fab7b209
parent 32c5d8411c9265c8e58545d076cbba8c3e10a7ee

Merge "Fix the last warning and enable -Werror for external/flac."

libFLAC/Android.mk

diff --git a/libFLAC/Android.mk b/libFLAC/Android.mk
index 6d97aa9..8c9d706 100644
--- a/libFLAC/Android.mk
+++ b/libFLAC/Android.mk
@@ -26,6 +26,7 @@
 LOCAL_CFLAGS += -DHAVE_CONFIG_H -DFLAC__NO_MD5 -DFLAC__INTEGER_ONLY_LIBRARY
 LOCAL_CFLAGS += -D_REENTRANT -DPIC -DU_COMMON_IMPLEMENTATION -fPIC
 LOCAL_CFLAGS += -O3 -funroll-loops -finline-functions
+LOCAL_CFLAGS += -Werror
 
 LOCAL_ARM_MODE := arm
 

libFLAC/stream_encoder.c

diff --git a/libFLAC/stream_encoder.c b/libFLAC/stream_encoder.c
index 6380ce6..23cc22d 100644
--- a/libFLAC/stream_encoder.c
+++ b/libFLAC/stream_encoder.c
@@ -2169,7 +2169,6 @@
 
 		for(channel = 0; channel < channels; channel++) {
 			if (buffer[channel] == NULL) {
-				encoder->protected_->state = FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
 				return false;
 			}
 			memcpy(&encoder->private_->integer_signal[channel][encoder->private_->current_sample_number], &buffer[channel][j], sizeof(buffer[channel][0]) * n);