Remove webrtc::Video from H264 encoder internals

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h

Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
index 3713896a8baca83a15a4b95ee71b279d1d559508..84db25c5dfb1242ec2c35241f08e268d20462d6f 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
@@ -70,7 +70,17 @@ class H264EncoderImpl : public H264Encoder {
   void ReportError();
 
   ISVCEncoder* openh264_encoder_;
-  VideoCodec codec_settings_;
+  // Settings that are used by this encoder.
+  int width_;
+  int height_;
+  float max_frame_rate_;
+  unsigned int target_bits_per_second_;
+  unsigned int max_bits_per_second_;

[stefan-webrtc, 2016/11/02 13:34:32]

Feel free to call target_bps_ and max_bps_. It's a commonly used abbreviation in
the code base.

+  VideoCodecMode mode_;
+  // H.264 specifc parameters
+  bool frame_dropping_on_;
+  int key_frame_interval_;
+
   int32_t number_of_cores_;
 
   EncodedImage encoded_image_;