diff --git a/ChangeLog b/ChangeLog
index e748e42c42..f0f5d00a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-20  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+	  Remove rank from ffdec_h263i until I know how it's different
+	  from ffdec_h263. Fixes #155163.
+
 2004-12-18  David Schleef  <ds@schleef.org>
 
 	* autogen.sh: execute ffmpeg's autogen.sh directly
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index b4adcd10cd..611f68cf2d 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -719,12 +719,19 @@ gst_ffmpegdec_register (GstPlugin * plugin)
 
     /* (Ronald) MPEG-4 gets a higher priority because it has been well-
      * tested and by far outperforms divxdec/xviddec - so we prefer it.
-     * msmpeg4v3 same, as it outperforms divxdec for divx3 playback. */
+     * msmpeg4v3 same, as it outperforms divxdec for divx3 playback.
+     * H263 has the same mimetype as H263I and since H263 works for the
+     * few streams that I've tried (see, e.g., #155163), I'll use that
+     * and use rank=none for H263I for now, until I know what the diff
+     * is. */
     switch (in_plugin->id) {
       case CODEC_ID_MPEG4:
       case CODEC_ID_MSMPEG4V3:
         rank = GST_RANK_PRIMARY;
         break;
+      case CODEC_ID_H263I:
+        rank = GST_RANK_NONE;
+        break;
       default:
         rank = GST_RANK_MARGINAL;
         break;