Remove use_system_ffmpeg-related logic from media and other mainline gyp files.

media/ffmpeg/ffmpeg_common.cc

 // 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.
 
 #include "media/ffmpeg/ffmpeg_common.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/video_frame.h"
@@ skipping 66 matching lines @@
     case AV_CODEC_ID_FLAC:
       return kCodecFLAC;
     case AV_CODEC_ID_AMR_NB:
       return kCodecAMR_NB;
     case AV_CODEC_ID_AMR_WB:
       return kCodecAMR_WB;
     case AV_CODEC_ID_GSM_MS:
       return kCodecGSM_MS;
     case AV_CODEC_ID_PCM_MULAW:
       return kCodecPCM_MULAW;
-#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
     case AV_CODEC_ID_OPUS:
       return kCodecOpus;
-#endif
     default:
       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
   }
   return kUnknownAudioCodec;
 }
 
 static AVCodecID AudioCodecToCodecID(AudioCodec audio_codec,
                                      SampleFormat sample_format) {
   switch (audio_codec) {
     case kCodecAAC:
@@ skipping 23 matching lines @@
     case kCodecFLAC:
       return AV_CODEC_ID_FLAC;
     case kCodecAMR_NB:
       return AV_CODEC_ID_AMR_NB;
     case kCodecAMR_WB:
       return AV_CODEC_ID_AMR_WB;
     case kCodecGSM_MS:
       return AV_CODEC_ID_GSM_MS;
     case kCodecPCM_MULAW:
       return AV_CODEC_ID_PCM_MULAW;
-#ifndef CHROMIUM_OMIT_AV_CODEC_ID_OPUS
     case kCodecOpus:
       return AV_CODEC_ID_OPUS;
-#endif
     default:
       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
   }
   return AV_CODEC_ID_NONE;
 }
 
 VideoCodec CodecIDToVideoCodec(AVCodecID codec_id) {
   switch (codec_id) {
     case AV_CODEC_ID_H264:
       return kCodecH264;
     case AV_CODEC_ID_THEORA:
       return kCodecTheora;
     case AV_CODEC_ID_MPEG4:
       return kCodecMPEG4;
     case AV_CODEC_ID_VP8:
       return kCodecVP8;
-#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
     case AV_CODEC_ID_VP9:
       return kCodecVP9;
-#endif
     default:
       DVLOG(1) << "Unknown video CodecID: " << codec_id;
   }
   return kUnknownVideoCodec;
 }
 
 static AVCodecID VideoCodecToCodecID(VideoCodec video_codec) {
   switch (video_codec) {
     case kCodecH264:
       return AV_CODEC_ID_H264;
     case kCodecTheora:
       return AV_CODEC_ID_THEORA;
     case kCodecMPEG4:
       return AV_CODEC_ID_MPEG4;
     case kCodecVP8:
       return AV_CODEC_ID_VP8;
-#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
     case kCodecVP9:
       return AV_CODEC_ID_VP9;
-#endif
     default:
       DVLOG(1) << "Unknown VideoCodec: " << video_codec;
   }
   return AV_CODEC_ID_NONE;
 }
 
 static VideoCodecProfile ProfileIDToVideoCodecProfile(int profile) {
   // Clear out the CONSTRAINED & INTRA flags which are strict subsets of the
   // corresponding profiles with which they're used.
   profile &= ~FF_PROFILE_H264_CONSTRAINED;
@@ skipping 324 matching lines @@
       return PIX_FMT_YUV420P;
     case VideoFrame::YV12A:
       return PIX_FMT_YUVA420P;
     default:
       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
   }
   return PIX_FMT_NONE;
 }
 
 }  // namespace media