@@ -36,6 +36,7 @@ version <next>:

 - IFF ANIM demuxer & decoder

 - Direct Stream Transfer (DST) decoder

 - loudnorm filter

+- MTAF demuxer and decoder

 version 3.0:

 - Common Encryption (CENC) MP4 encoding and decoding support

@@ -301,6 +301,7 @@ OBJS-$(CONFIG_MPL2_DEMUXER)              += mpl2dec.o subtitles.o

 OBJS-$(CONFIG_MSF_DEMUXER)               += msf.o

 OBJS-$(CONFIG_MPSUB_DEMUXER)             += mpsubdec.o subtitles.o

 OBJS-$(CONFIG_MSNWC_TCP_DEMUXER)         += msnwc_tcp.o

+OBJS-$(CONFIG_MTAF_DEMUXER)              += mtaf.o

 OBJS-$(CONFIG_MTV_DEMUXER)               += mtv.o

 OBJS-$(CONFIG_MUSX_DEMUXER)              += musx.o

 OBJS-$(CONFIG_MV_DEMUXER)                += mvdec.o

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

     REGISTER_DEMUXER (MPSUB,            mpsub);

     REGISTER_DEMUXER (MSF,              msf);

     REGISTER_DEMUXER (MSNWC_TCP,        msnwc_tcp);

+    REGISTER_DEMUXER (MTAF,             mtaf);

     REGISTER_DEMUXER (MTV,              mtv);

     REGISTER_DEMUXER (MUSX,             musx);

     REGISTER_DEMUXER (MV,               mv);

new file mode 100644

@@ -0,0 +1,81 @@

+/*

+ * MTAF demuxer

+ * Copyright (c) 2016 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/channel_layout.h"

+#include "libavutil/intreadwrite.h"

+#include "avformat.h"

+#include "internal.h"

+

+static int mtaf_probe(AVProbeData *p)

+{

+    if (p->buf_size < 0x44)

+        return 0;

+

+    if (AV_RL32(p->buf) != MKTAG('M','T','A','F') ||

+        AV_RL32(p->buf + 0x40) != MKTAG('H','E','A','D'))

+        return 0;

+

+    return AVPROBE_SCORE_MAX;

+}

+

+static int mtaf_read_header(AVFormatContext *s)

+{

+    int stream_count;

+    AVStream *st;

+

+    st = avformat_new_stream(s, NULL);

+    if (!st)

+        return AVERROR(ENOMEM);

+

+    avio_skip(s->pb, 0x5c);

+    st->duration = avio_rl32(s->pb);

+    avio_skip(s->pb, 1);

+    stream_count = avio_r8(s->pb);

+    if (!stream_count)

+        return AVERROR_INVALIDDATA;

+

+    st->codecpar->codec_type  = AVMEDIA_TYPE_AUDIO;

+    st->codecpar->codec_id    = AV_CODEC_ID_ADPCM_MTAF;

+    st->codecpar->channels    = 2 * stream_count;

+    st->codecpar->sample_rate = 48000;

+    st->codecpar->block_align = 0x110 * st->codecpar->channels / 2;

+    avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);

+

+    avio_seek(s->pb, 0x800, SEEK_SET);

+

+    return 0;

+}

+

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

+{

+    AVCodecParameters *par = s->streams[0]->codecpar;

+

+    return av_get_packet(s->pb, pkt, par->block_align);

+}

+

+AVInputFormat ff_mtaf_demuxer = {

+    .name           = "mtaf",

+    .long_name      = NULL_IF_CONFIG_SMALL("Konami PS2 MTAF"),

+    .read_probe     = mtaf_probe,

+    .read_header    = mtaf_read_header,

+    .read_packet    = mtaf_read_packet,

+    .extensions     = "mtaf",

+};

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

 #include "libavutil/version.h"

 #define LIBAVFORMAT_VERSION_MAJOR  57

-#define LIBAVFORMAT_VERSION_MINOR  36

+#define LIBAVFORMAT_VERSION_MINOR  37

 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \