Revert of H.264 packetization mode 0 (try 2)

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

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  *
  */
@@ skipping 21 matching lines @@
 
   // |max_payload_size| is ignored.
   // The following members of |codec_settings| are used. The rest are ignored.
   // - codecType (must be kVideoCodecH264)
   // - targetBitrate
   // - maxFramerate
   // - width
   // - height
   int32_t InitEncode(const VideoCodec* codec_settings,
                      int32_t number_of_cores,
-                     size_t max_payload_size) override;
+                     size_t /*max_payload_size*/) override;
   int32_t Release() override;
 
   int32_t RegisterEncodeCompleteCallback(
       EncodedImageCallback* callback) override;
   int32_t SetRates(uint32_t bitrate, uint32_t framerate) override;
 
   // The result of encoding - an EncodedImage and RTPFragmentationHeader - are
   // passed to the encode complete callback.
   int32_t Encode(const VideoFrame& frame,
                  const CodecSpecificInfo* codec_specific_info,
@@ skipping 20 matching lines @@
   // Settings that are used by this encoder.
   int width_;
   int height_;
   float max_frame_rate_;
   unsigned int target_bps_;
   unsigned int max_bps_;
   VideoCodecMode mode_;
   // H.264 specifc parameters
   bool frame_dropping_on_;
   int key_frame_interval_;
-  H264PacketizationMode packetization_mode_;
 
-  size_t max_payload_size_;
   int32_t number_of_cores_;
 
   EncodedImage encoded_image_;
   std::unique_ptr<uint8_t[]> encoded_image_buffer_;
   EncodedImageCallback* encoded_image_callback_;
 
   bool has_reported_init_;
   bool has_reported_error_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_H264_H264_ENCODER_IMPL_H_