@@ -19,6 +19,7 @@ version next:

 - RealAudio Lossless decoder

 - ZeroCodec decoder

 - tile video filter

+- Metal Gear Solid: The Twin Snakes demuxer

 version 0.10:

@@ -210,6 +210,7 @@ library:

 @item MAXIS XA                  @tab   @tab X

     @tab Used in Sim City 3000; file extension .xa.

 @item MD Studio                 @tab   @tab X

+@item Metal Gear Solid: The Twin Snakes @tab @tab X

 @item Mobotix .mxg              @tab   @tab X

 @item Monkey's Audio            @tab   @tab X

 @item Motion Pixels MVI         @tab   @tab X

@@ -143,6 +143,7 @@ OBJS-$(CONFIG_MATROSKA_MUXER)            += matroskaenc.o matroska.o \

                                             isom.o avc.o \

                                             flacenc_header.o avlanguage.o

 OBJS-$(CONFIG_MD5_MUXER)                 += md5enc.o

+OBJS-$(CONFIG_MGSTS_DEMUXER)             += mgsts.o

 OBJS-$(CONFIG_MICRODVD_DEMUXER)          += microdvddec.o

 OBJS-$(CONFIG_MICRODVD_MUXER)            += microdvdenc.o rawenc.o

 OBJS-$(CONFIG_MJPEG_DEMUXER)             += rawdec.o

@@ -134,6 +134,7 @@ void av_register_all(void)

     REGISTER_MUXER    (MD5, md5);

     REGISTER_MUXDEMUX (MATROSKA, matroska);

     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);

+    REGISTER_DEMUXER  (MGSTS, mgsts);

     REGISTER_MUXDEMUX (MICRODVD, microdvd);

     REGISTER_MUXDEMUX (MJPEG, mjpeg);

     REGISTER_MUXDEMUX (MLP, mlp);

new file mode 100644

@@ -0,0 +1,103 @@

+/*

+ * Metar Gear Solid: The Twin Snakes demuxer

+ * Copyright (c) 2012 Paul B Mahol

+ *

+ * 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 "libavutil/intreadwrite.h"

+#include "libavutil/intfloat.h"

+#include "avformat.h"

+#include "riff.h"

+

+static int read_probe(AVProbeData *p)

+{

+    if (AV_RB32(p->buf     ) != 0x000E ||

+        AV_RB32(p->buf +  4) != 0x0050 ||

+        AV_RB32(p->buf + 12) != 0x0034)

+        return 0;

+    return AVPROBE_SCORE_MAX;

+}

+

+static int read_header(AVFormatContext *s)

+{

+    AVIOContext *pb = s->pb;

+    AVStream    *st;

+    AVRational  fps;

+    uint32_t chunk_size;

+

+    avio_skip(pb, 4);

+    chunk_size = avio_rb32(pb);

+    if (chunk_size != 80)

+        return AVERROR(EIO);

+    avio_skip(pb, 20);

+

+    st = avformat_new_stream(s, 0);

+    if (!st)

+        return AVERROR(ENOMEM);

+

+    st->start_time = 0;

+    st->nb_frames  =

+    st->duration   = avio_rb32(pb);

+    fps = av_d2q(av_int2float(avio_rb32(pb)), INT_MAX);

+    st->codec->width  = avio_rb32(pb);

+    st->codec->height = avio_rb32(pb);

+    avio_skip(pb, 12);

+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;

+    st->codec->codec_tag  = avio_rb32(pb);

+    st->codec->codec_id   = ff_codec_get_id(ff_codec_bmp_tags,

+                                            st->codec->codec_tag);

+    avpriv_set_pts_info(st, 64, fps.den, fps.num);

+    avio_skip(pb, 20);

+

+    return 0;

+}

+

+static int read_packet(AVFormatContext *s, AVPacket *pkt)

+{

+    AVIOContext *pb = s->pb;

+    uint32_t chunk_size, payload_size;

+    int ret;

+

+    if (url_feof(pb))

+        return AVERROR_EOF;

+

+    avio_skip(pb, 4);

+    chunk_size = avio_rb32(pb);

+    avio_skip(pb, 4);

+    payload_size = avio_rb32(pb);

+

+    if (chunk_size < payload_size + 16)

+        return AVERROR(EIO);

+

+    ret = av_get_packet(pb, pkt, payload_size);

+    if (ret < 0)

+        return ret;

+

+    pkt->duration = 1;

+    avio_skip(pb, chunk_size - (ret + 16));

+

+    return ret;

+}

+

+AVInputFormat ff_mgsts_demuxer = {

+    .name        = "mgsts",

+    .long_name   = NULL_IF_CONFIG_SMALL("Metal Gear Solid: The Twin Snakes"),

+    .read_probe  = read_probe,

+    .read_header = read_header,

+    .read_packet = read_packet,

+};

@@ -30,7 +30,7 @@

 #include "libavutil/avutil.h"

 #define LIBAVFORMAT_VERSION_MAJOR 54

-#define LIBAVFORMAT_VERSION_MINOR  2

+#define LIBAVFORMAT_VERSION_MINOR  3

 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \