diff --git a/ChangeLog b/ChangeLog
index 410192e2e2..76c678b805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-13  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* ext/ffmpeg/gstffmpegcodecmap.c:
+	(gst_ffmpeg_formatid_get_codecids):
+	MP4 does not allow H263 and AMR.
+
 2008-06-13  Edward Hervey  <edward.hervey@collabora.co.uk>
 
 	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 933776ef6c..aac3001323 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1872,12 +1872,12 @@ gst_ffmpeg_formatid_get_codecids (const gchar * format_name,
 
   if (!strcmp (format_name, "mp4")) {
     static enum CodecID mp4_video_list[] = {
-      CODEC_ID_MPEG4, CODEC_ID_H263, CODEC_ID_H264,
+      CODEC_ID_MPEG4, CODEC_ID_H264,
       CODEC_ID_MJPEG,
       CODEC_ID_NONE
     };
     static enum CodecID mp4_audio_list[] = {
-      CODEC_ID_AAC, CODEC_ID_MP3, CODEC_ID_AMR_NB, CODEC_ID_AMR_WB,
+      CODEC_ID_AAC, CODEC_ID_MP3, 
       CODEC_ID_NONE
     };