diff --git a/libavformat/Makefile b/libavformat/Makefile
index e22608a6db..e5176e0b9b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -90,6 +90,7 @@ OBJS-$(CONFIG_IMAGE2PIPE_MUXER)          += img2.o
 OBJS-$(CONFIG_INGENIENT_DEMUXER)         += raw.o
 OBJS-$(CONFIG_IPMOVIE_DEMUXER)           += ipmovie.o
 OBJS-$(CONFIG_ISS_DEMUXER)               += iss.o
+OBJS-$(CONFIG_IV8_DEMUXER)               += iv8.o
 OBJS-$(CONFIG_LMLM4_DEMUXER)             += lmlm4.o
 OBJS-$(CONFIG_M4V_DEMUXER)               += raw.o
 OBJS-$(CONFIG_M4V_MUXER)                 += raw.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index f978426fdd..0dfaa93b6c 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -99,6 +99,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (IPMOVIE, ipmovie);
     REGISTER_MUXER    (IPOD, ipod);
     REGISTER_DEMUXER  (ISS, iss);
+    REGISTER_DEMUXER  (IV8, iv8);
     REGISTER_DEMUXER  (LMLM4, lmlm4);
     REGISTER_MUXDEMUX (M4V, m4v);
     REGISTER_MUXDEMUX (MATROSKA, matroska);
diff --git a/libavformat/iv8.c b/libavformat/iv8.c
new file mode 100644
index 0000000000..33894ad9f8
--- /dev/null
+++ b/libavformat/iv8.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2009 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avformat.h"
+
+
+static int probe(AVProbeData *p)
+{
+    // the single file i have starts with that, i dont know if others do too
+    if(   p->buf[0] == 1
+       && p->buf[1] == 1
+       && p->buf[2] == 3
+       && p->buf[3] == 0xB8
+       && p->buf[4] == 0x80
+       && p->buf[5] == 0x60
+      )
+        return AVPROBE_SCORE_MAX-2;
+
+    return 0;
+}
+
+static int read_header(AVFormatContext *s, AVFormatParameters *ap)
+{
+    AVStream *st;
+
+    st = av_new_stream(s, 0);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_id = CODEC_ID_MPEG4;
+    st->need_parsing = AVSTREAM_PARSE_FULL;
+    av_set_pts_info(st, 64, 1, 90000);
+
+    return 0;
+
+}
+
+static int read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    int ret, size, pts;
+
+    get_be16(s->pb); // 257
+    size= get_be16(s->pb);
+
+    get_be16(s->pb); //some flags, 0x80 indicates end of frame
+    get_be16(s->pb); //packet number
+    pts=get_be32(s->pb);
+    get_be32(s->pb); //6A 13 E3 88
+
+    size -= 12;
+    if(size<1)
+        return -1;
+
+    ret= av_get_packet(s->pb, pkt, size);
+
+    pkt->pts= pkt->dts= pts;
+    pkt->pos-=16;
+
+    pkt->stream_index = 0;
+
+    return ret;
+}
+
+AVInputFormat iv8_demuxer = {
+    "iv8",
+    NULL_IF_CONFIG_SMALL("A format generated by IndigoVision 8000 video server"),
+    0,
+    probe,
+    read_header,
+    read_packet,
+    .flags= AVFMT_GENERIC_INDEX,
+    .value = CODEC_ID_MPEG4,
+};