Revert of media config: expand is_encrypted to a struct.

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 #include <stdint.h>
 
 // Used for FFmpeg error codes.
@@ skipping 34 matching lines @@
 #include <libavutil/imgutils.h>
 #include <libavutil/log.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/opt.h>
 MSVC_POP_WARNING();
 }  // extern "C"
 
 namespace media {
 
 class AudioDecoderConfig;
-class EncryptionScheme;
 class VideoDecoderConfig;
 
 // The following implement the deleters declared in ffmpeg_deleters.h (which
 // contains the declarations needed for use with |scoped_ptr| without #include
 // "pollution").
 
 inline void ScopedPtrAVFree::operator()(void* x) const {
   av_free(x);
 }
 
@@ skipping 41 matching lines @@
                                                VideoDecoderConfig* config);
 void VideoDecoderConfigToAVCodecContext(
     const VideoDecoderConfig& config,
     AVCodecContext* codec_context);
 
 // Returns true if AVCodecContext is successfully converted to an
 // AudioDecoderConfig. Returns false if conversion fails, in which case |config|
 // is not modified.
 MEDIA_EXPORT bool AVCodecContextToAudioDecoderConfig(
     const AVCodecContext* codec_context,
-    const EncryptionScheme& encryption_scheme,
+    bool is_encrypted,
     AudioDecoderConfig* config);
 
 // Converts FFmpeg's channel layout to chrome's ChannelLayout.  |channels| can
 // be used when FFmpeg's channel layout is not informative in order to make a
 // good guess about the plausible channel layout based on number of channels.
 MEDIA_EXPORT ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout,
                                                               int channels);
 
 MEDIA_EXPORT AVCodecID AudioCodecToCodecID(AudioCodec audio_codec,
                                            SampleFormat sample_format);
@@ skipping 18 matching lines @@
 // date string. Otherwise returns fals and timeline_offset is unmodified.
 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out);
 
 // Returns a 32-bit hash for the given codec name.  See the VerifyUmaCodecHashes
 // unit test for more information and code for generating the histogram XML.
 MEDIA_EXPORT int32_t HashCodecName(const char* codec_name);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_