diff --git a/ChangeLog b/ChangeLog
index 7755ded306..04940bad41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-06  Edward Hervey  <edward@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_init):
+	Properly initialize ->lmin, ->lmax and ->max_key_interval so we don't
+	end up passing completely bogus data to the AVCodecContext.
+	Fixes #355584
+
 2006-10-05  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_get_stream):
diff --git a/common b/common
index a4af1b8542..83b08805d0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb
+Subproject commit 83b08805d0c109b6dbdcfca0a8b9659b1c556480
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index 7018c0709f..a5f07dcba0 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -242,6 +242,10 @@ gst_ffmpegenc_init (GstFFMpegEnc * ffmpegenc)
     ffmpegenc->gop_size = DEFAULT_VIDEO_GOP_SIZE;
     ffmpegenc->rtp_payload_size = 0;
 
+    ffmpegenc->lmin = 2;
+    ffmpegenc->lmax = 31;
+    ffmpegenc->max_key_interval = 0;
+
     gst_ffmpeg_cfg_set_defaults (ffmpegenc);
   } else if (oclass->in_plugin->type == CODEC_TYPE_AUDIO) {
     gst_pad_set_chain_function (ffmpegenc->sinkpad, gst_ffmpegenc_chain_audio);