Don't re-randomize picture_id/tl0_pic_idx when re-initializing internal encoders.

webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc

Index: webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
diff --git a/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc b/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
index 82992058c9a4b578a29fa912f501d0981eee162c..9db694e56b9f071dfefb78a19539747a61991f6a 100644
--- a/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
+++ b/webrtc/modules/video_coding/codecs/h264/test/h264_impl_unittest.cc
@@ -44,7 +44,8 @@ TEST_F(TestH264Impl, MAYBE_EncodeDecode) {
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->Encode(*input_frame_, nullptr, nullptr));
   EncodedImage encoded_frame;
-  ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame));
+  CodecSpecificInfo codec_specific_info;
+  ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame, &codec_specific_info));
   // First frame should be a key frame.
   encoded_frame._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
@@ -60,7 +61,8 @@ TEST_F(TestH264Impl, MAYBE_DecodedQpEqualsEncodedQp) {
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->Encode(*input_frame_, nullptr, nullptr));
   EncodedImage encoded_frame;
-  ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame));
+  CodecSpecificInfo codec_specific_info;
+  ASSERT_TRUE(WaitForEncodedFrame(&encoded_frame, &codec_specific_info));
   // First frame should be a key frame.
   encoded_frame._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,