@@ -20,8 +20,9 @@ version <next>:

 - selectivecolor filter

 - extensive native AAC encoder improvements

 - ADPCM PSX decoder

-- genh, vag, ads & svag demuxer

+- genh, vag, ads, msf & svag demuxer

 - zscale filter

+- wve demuxer

 version 2.8:

@@ -481,6 +481,7 @@ OBJS-$(CONFIG_WTV_DEMUXER)               += wtvdec.o wtv_common.o asf.o \

 OBJS-$(CONFIG_WTV_MUXER)                 += wtvenc.o wtv_common.o \

                                             mpegtsenc.o asf.o

 OBJS-$(CONFIG_WV_DEMUXER)                += wvdec.o wv.o apetag.o img2.o

+OBJS-$(CONFIG_WVE_DEMUXER)               += wvedec.o pcm.o

 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

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

     REGISTER_DEMUXER (WSAUD,            wsaud);

     REGISTER_DEMUXER (WSVQA,            wsvqa);

     REGISTER_MUXDEMUX(WTV,              wtv);

+    REGISTER_DEMUXER (WVE,              wve);

     REGISTER_MUXDEMUX(WV,               wv);

     REGISTER_DEMUXER (XA,               xa);

     REGISTER_DEMUXER (XBIN,             xbin);

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

 #include "libavutil/version.h"

 #define LIBAVFORMAT_VERSION_MAJOR  57

-#define LIBAVFORMAT_VERSION_MINOR   9

+#define LIBAVFORMAT_VERSION_MINOR  10

 #define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \

new file mode 100644

@@ -0,0 +1,62 @@

+/*

+ * 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 "avformat.h"

+#include "internal.h"

+#include "pcm.h"

+

+static int wve_probe(AVProbeData *p)

+{

+    if (memcmp(p->buf, "ALawSoundFile**\0\017\020", 18) ||

+        memcmp(p->buf + 22, "\0\0\0\1\0\0\0\0\0\0", 10))

+        return 0;

+    return AVPROBE_SCORE_MAX;

+}

+

+static int wve_read_header(AVFormatContext *s)

+{

+    AVStream *st;

+

+    st = avformat_new_stream(s, NULL);

+    if (!st)

+        return AVERROR(ENOMEM);

+

+    avio_skip(s->pb, 18);

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

+    st->codec->codec_type  = AVMEDIA_TYPE_AUDIO;

+    st->codec->codec_id    = AV_CODEC_ID_PCM_ALAW;

+    st->codec->sample_rate = 8000;

+    st->codec->channels    = 1;

+    st->codec->bits_per_coded_sample = av_get_bits_per_sample(st->codec->codec_id);

+    st->codec->block_align = st->codec->bits_per_coded_sample * st->codec->channels / 8;

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

+    avio_skip(s->pb, 10);

+

+    return 0;

+}

+

+AVInputFormat ff_wve_demuxer = {

+    .name           = "wve",

+    .long_name      = NULL_IF_CONFIG_SMALL("Psion 3 audio"),

+    .read_probe     = wve_probe,

+    .read_header    = wve_read_header,

+    .read_packet    = ff_pcm_read_packet,

+    .read_seek      = ff_pcm_read_seek,

+};