diff --git a/Changelog b/Changelog
index a3f8c033d1d90129318b1ff2a805dd5a07fdbf32..abaac19d22a10d7c8e34b52fca171c05bc5066b0 100644
--- a/Changelog
+++ b/Changelog
@@ -20,7 +20,7 @@ version <next>:
 - selectivecolor filter
 - extensive native AAC encoder improvements
 - ADPCM PSX decoder
-- genh, vag, ads, msf & svag demuxer
+- genh, vag, xvag, ads, msf & svag demuxer
 - zscale filter
 - wve demuxer
 - zero-copy Intel QSV transcoding in ffmpeg
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 42b1e1970b0ea0c9eef6ecaa01debe8d2a9e1e7f..5ca2843d37c7be46c22d66e2c27d515aa86f60b7 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -487,6 +487,7 @@ OBJS-$(CONFIG_WV_MUXER)                  += wvenc.o wv.o apetag.o img2.o
 OBJS-$(CONFIG_XA_DEMUXER)                += xa.o
 OBJS-$(CONFIG_XBIN_DEMUXER)              += bintext.o sauce.o
 OBJS-$(CONFIG_XMV_DEMUXER)               += xmv.o
+OBJS-$(CONFIG_XVAG_DEMUXER)              += xvag.o
 OBJS-$(CONFIG_XWMA_DEMUXER)              += xwma.o
 OBJS-$(CONFIG_YOP_DEMUXER)               += yop.o
 OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpegenc.o
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index 5f691efe367a3cfdb68d617800dc7fa957e48f27..69c02b10601086736242a63b571815489c61d0ac 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -336,6 +336,7 @@ void av_register_all(void)
     REGISTER_DEMUXER (XA,               xa);
     REGISTER_DEMUXER (XBIN,             xbin);
     REGISTER_DEMUXER (XMV,              xmv);
+    REGISTER_DEMUXER (XVAG,             xvag);
     REGISTER_DEMUXER (XWMA,             xwma);
     REGISTER_DEMUXER (YOP,              yop);
     REGISTER_MUXDEMUX(YUV4MPEGPIPE,     yuv4mpegpipe);
diff --git a/libavformat/version.h b/libavformat/version.h
index f2dc0eb61a57f8919e2b02dfbd5f9a43f3140783..c48e3b82396a28ed1b3dc4e61331c565ac0a7641 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -30,8 +30,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVFORMAT_VERSION_MAJOR  57
-#define LIBAVFORMAT_VERSION_MINOR  10
-#define LIBAVFORMAT_VERSION_MICRO 102
+#define LIBAVFORMAT_VERSION_MINOR  11
+#define LIBAVFORMAT_VERSION_MICRO 100
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
diff --git a/libavformat/xvag.c b/libavformat/xvag.c
new file mode 100644
index 0000000000000000000000000000000000000000..92c80a48e8204b041959068f9d1a2094104dbbad
--- /dev/null
+++ b/libavformat/xvag.c
@@ -0,0 +1,112 @@
+/*
+ * XVAG demuxer
+ * Copyright (c) 2015 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/bswap.h"
+#include "avformat.h"
+#include "internal.h"
+
+static int xvag_probe(AVProbeData *p)
+{
+    if (memcmp(p->buf, "XVAG", 4) ||
+        memcmp(p->buf+32, "fmat", 4))
+        return 0;
+
+    return AVPROBE_SCORE_MAX;
+}
+
+static int xvag_read_header(AVFormatContext *s)
+{
+    unsigned offset, big_endian, codec;
+    AVStream *st;
+
+    avio_skip(s->pb, 4);
+
+    st = avformat_new_stream(s, NULL);
+    if (!st)
+        return AVERROR(ENOMEM);
+
+    st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+
+    offset     = avio_rl32(s->pb);
+    big_endian = offset > av_bswap32(offset);
+    if (big_endian) {
+        offset                 = av_bswap32(offset);
+        avio_skip(s->pb, 28);
+        codec                  = avio_rb32(s->pb);
+        st->codec->channels    = avio_rb32(s->pb);
+        avio_skip(s->pb, 4);
+        st->duration           = avio_rb32(s->pb);
+        avio_skip(s->pb, 8);
+        st->codec->sample_rate = avio_rb32(s->pb);
+    } else {
+        avio_skip(s->pb, 28);
+        codec                  = avio_rl32(s->pb);
+        st->codec->channels    = avio_rl32(s->pb);
+        avio_skip(s->pb, 4);
+        st->duration           = avio_rl32(s->pb);
+        avio_skip(s->pb, 8);
+        st->codec->sample_rate = avio_rl32(s->pb);
+    }
+
+    if (st->codec->sample_rate <= 0)
+        return AVERROR_INVALIDDATA;
+    if (st->codec->channels <= 0)
+        return AVERROR_INVALIDDATA;
+
+    switch (codec) {
+    case 0x1c:
+        st->codec->codec_id    = AV_CODEC_ID_ADPCM_PSX;
+        st->codec->block_align = 16 * st->codec->channels;
+        break;
+    default:
+        avpriv_request_sample(s, "codec %X", codec);
+        return AVERROR_PATCHWELCOME;
+    };
+
+    avio_skip(s->pb, offset - avio_tell(s->pb));
+
+    if (avio_rb16(s->pb) == 0xFFFB) {
+        st->codec->codec_id    = AV_CODEC_ID_MP3;
+        st->codec->block_align = 0x1000;
+        st->need_parsing       = AVSTREAM_PARSE_FULL_RAW;
+    }
+
+    avio_skip(s->pb, -2);
+    avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
+
+    return 0;
+}
+
+static int xvag_read_packet(AVFormatContext *s, AVPacket *pkt)
+{
+    AVCodecContext *codec = s->streams[0]->codec;
+
+    return av_get_packet(s->pb, pkt, codec->block_align);
+}
+
+AVInputFormat ff_xvag_demuxer = {
+    .name           = "xvag",
+    .long_name      = NULL_IF_CONFIG_SMALL("Sony PS3 XVAG"),
+    .read_probe     = xvag_probe,
+    .read_header    = xvag_read_header,
+    .read_packet    = xvag_read_packet,
+    .extensions     = "xvag",
+};