Merge commit '58b619c8a226cc4564ad5af291bc99a04f89ee56'

* commit '58b619c8a226cc4564ad5af291bc99a04f89ee56':
  wav muxer: write metadata

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc Changelog
index 0864c3e,9e5ee87..c33ff48
--- 1/Changelog
--- 2/Changelog
+++ b/Changelog
@@@ -1,28 -1,34 +1,29 @@@
  Entries are sorted chronologically from oldest to youngest within each release,
  releases are sorted from youngest to oldest.
  
- version next:
+ version <next>:
 +
 +- stream disposition information printing in ffprobe
 +- filter for loudness analysis following EBU R128
 +- Opus encoder using libopus
 +- ffprobe -select_streams option
 +- Pinnacle TARGA CineWave YUV16 decoder
 +- TAK demuxer, decoder and parser
 +- DTS-HD demuxer
 +- remove -same_quant, it hasn't worked for years
 +- X-Face image encoder and decoder
+ - metadata (INFO tag) support in WAV muxer
  
  
 -version 9_beta1:
 +version 1.0:
  
 -- XWD encoder and decoder
 -- Support for fragmentation in the mov/mp4 muxer
 -- ISMV (Smooth Streaming) muxer
 -- CDXL demuxer and decoder
 -- Apple ProRes encoder
 -- Sun Rasterfile Encoder
 -- remove libpostproc
 -- ID3v2 attached pictures reading and writing
 -- WMA Lossless decoder
 -- XBM encoder
 -- RealAudio Lossless decoder
 -- ZeroCodec decoder
 -- drop support for avconv without libavfilter
 -- add libavresample audio conversion library
 -- audio filters support in libavfilter and avconv
 -- add fps filter
 -- audio split filter
 -- audio mix filter
 -- avprobe output is now standard INI or JSON. The old format can still
 -  be used with -of old.
 +- INI and flat output in ffprobe
 +- Scene detection in libavfilter
  - Indeo Audio decoder
  - channelsplit audio filter
 +- setnsamples audio filter
 +- atempo filter
 +- ffprobe -show_data option
  - RTMPT protocol support
  - iLBC encoding/decoding via libilbc
  - Microsoft Screen 1 decoder

diff --cc libavformat/version.h
index c757fdd,034fa0a..749b9e0
--- 1/libavformat/version.h
--- 2/libavformat/version.h
+++ b/libavformat/version.h
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 54
- #define LIBAVFORMAT_VERSION_MINOR 32
- #define LIBAVFORMAT_VERSION_MICRO 101
 -#define LIBAVFORMAT_VERSION_MINOR 19
 -#define LIBAVFORMAT_VERSION_MICRO  0
++#define LIBAVFORMAT_VERSION_MINOR 33
++#define LIBAVFORMAT_VERSION_MICRO 100
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \

diff --cc libavformat/wav.c
Simple merge

diff --cc tests/ref/fate/mapchan-6ch-extract-2
index 98c8540,0000000..3590bb8
mode 100644,000000..100644
--- 1/tests/ref/fate/mapchan-6ch-extract-2
--- /dev/null
+++ b/tests/ref/fate/mapchan-6ch-extract-2
@@@ -1,2 -1,0 +1,2 @@@
- 6f091fe8c0be88c75921731dc9f74314
- 5c2d162b9024329eb367295d37b8ca0a
++40a98f34b1f34da59ff9d9ebf55654ad
++9a252de5d38890c4bf52fd1f983a1865

diff --cc tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
index f42de0c,0000000..aea3ae3
mode 100644,000000..100644
--- 1/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
--- /dev/null
+++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono
@@@ -1,1 -1,0 +1,1 @@@
- 959645ed73e6d08d8f1e947eac5d0b92
++339a7c7c67b96df0aac636adc852a3a9

diff --cc tests/ref/fate/mapchan-silent-mono
index a867e3b,0000000..d3d032e
mode 100644,000000..100644
--- 1/tests/ref/fate/mapchan-silent-mono
--- /dev/null
+++ b/tests/ref/fate/mapchan-silent-mono
@@@ -1,1 -1,0 +1,1 @@@
- 4f5148f08587a4b9794aa52aec7852ac
++60ebd29f1ee6b700392969083016560c

diff --cc tests/ref/lavf/wav
index bbbacc3,bbbacc3..cc8ec1d
--- 1/tests/ref/lavf/wav
--- 2/tests/ref/lavf/wav
+++ b/tests/ref/lavf/wav
@@@ -1,3 -1,3 +1,3 @@@
--8854ea97f2d2172383941b001c69228b *./tests/data/lavf/lavf.wav
--90158 ./tests/data/lavf/lavf.wav
++c4afa6eafac5243aa1c202397789ccb8 *./tests/data/lavf/lavf.wav
++90188 ./tests/data/lavf/lavf.wav
  ./tests/data/lavf/lavf.wav CRC=0xf1ae5536

diff --cc tests/ref/seek/lavf_wav
index 1a9cfc5,1a9cfc5..16a33be
--- 1/tests/ref/seek/lavf_wav
--- 2/tests/ref/seek/lavf_wav
+++ b/tests/ref/seek/lavf_wav
@@@ -1,53 -1,53 +1,53 @@@
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st:-1 flags:0  ts:-1.000000
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st:-1 flags:1  ts: 1.894167
  ret:-EOF
  ret: 0         st: 0 flags:0  ts: 0.788345
--ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69578 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos:  69608 size:  4096
  ret: 0         st: 0 flags:1  ts:-0.317506
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st:-1 flags:0  ts: 2.576668
  ret:-EOF
  ret: 0         st:-1 flags:1  ts: 1.470835
  ret:-EOF
  ret: 0         st: 0 flags:0  ts: 0.365011
--ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32240 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos:  32270 size:  4096
  ret: 0         st: 0 flags:1  ts:-0.740839
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st:-1 flags:0  ts: 2.153336
  ret:-EOF
  ret: 0         st:-1 flags:1  ts: 1.047503
  ret:-EOF
  ret: 0         st: 0 flags:0  ts:-0.058322
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st: 0 flags:1  ts: 2.835828
  ret:-EOF
  ret: 0         st:-1 flags:0  ts: 1.730004
  ret:-EOF
  ret: 0         st:-1 flags:1  ts: 0.624171
--ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55098 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos:  55128 size:  4096
  ret: 0         st: 0 flags:0  ts:-0.481655
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st: 0 flags:1  ts: 2.412494
  ret:-EOF
  ret: 0         st:-1 flags:0  ts: 1.306672
  ret:-EOF
  ret: 0         st:-1 flags:1  ts: 0.200839
--ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17760 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos:  17790 size:  4096
  ret: 0         st: 0 flags:0  ts:-0.904989
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st: 0 flags:1  ts: 1.989184
  ret:-EOF
  ret: 0         st:-1 flags:0  ts: 0.883340
--ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77956 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos:  77986 size:  4096
  ret: 0         st:-1 flags:1  ts:-0.222493
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096
  ret: 0         st: 0 flags:0  ts: 2.671678
  ret:-EOF
  ret: 0         st: 0 flags:1  ts: 1.565850
  ret:-EOF
  ret: 0         st:-1 flags:0  ts: 0.460008
--ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40618 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos:  40648 size:  4096
  ret: 0         st:-1 flags:1  ts:-0.645825
--ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     46 size:  4096
++ret: 0         st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos:     76 size:  4096