[Merged] media: Properly tell whether the buffer is encrypted

media/filters/android/media_codec_audio_decoder.cc

Index: media/filters/android/media_codec_audio_decoder.cc
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc
index c3bca6a7cee874e0e1bd32dbababa53a3c028736..dbcd801a0fc84024b2340378188e6d2d35e22f2f 100644
--- a/media/filters/android/media_codec_audio_decoder.cc
+++ b/media/filters/android/media_codec_audio_decoder.cc
@@ -417,7 +417,7 @@ bool MediaCodecAudioDecoder::EnqueueInputBuffer(
   media::MediaCodecStatus status = MEDIA_CODEC_OK;
 
   const DecryptConfig* decrypt_config = decoder_buffer->decrypt_config();
-  if (decrypt_config) {
+  if (decrypt_config && decrypt_config->is_encrypted()) {
     // A pending buffer is already filled with data, no need to copy it again.
     const uint8_t* memory =
         input_info.is_pending ? nullptr : decoder_buffer->data();