ffmpeg/libavformat
Daniel Verkamp 5e7d21c7ad ff_put_wav_header: add flag to force WAVEFORMATEX
Partially undoes commit 2c4e08d893:

    riff: always generate a proper WAVEFORMATEX structure in
    ff_put_wav_header

A new flag, FF_PUT_WAV_HEADER_FORCE_WAVEFORMATEX, is added to force the
use of WAVEFORMATEX rather than PCMWAVEFORMAT even for PCM codecs.

This flag is used in the Matroska muxer (the cause of the original
change) and in the ASF muxer, because the specifications for
these formats indicate explicitly that WAVEFORMATEX should be used.

Muxers for other formats will return to the original behavior of writing
PCMWAVEFORMAT when writing a header for raw PCM.

In particular, this causes raw PCM in WAV to generate the canonical
44-byte header expected by some tools.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-30 16:41:35 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
aiffenc.c
allformats.c Silicon Graphics Movie demuxer 2014-04-19 16:24:27 +02:00
amr.c Improve amr bitrate calculation for VBR files. 2014-04-11 23:38:53 +02:00
anm.c
apc.c
ape.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
apetag.c
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
asfenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h avformat: Fix decoder search in find stream info 2014-04-21 05:27:08 +02:00
avformatres.rc
avi.h
avidec.c Fix dont and doesnt typos 2014-04-27 15:14:32 +02:00
avienc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
avio_internal.h Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' 2014-04-18 00:38:07 +02:00
avio.c avformat/avio: also set generic URL context options 2014-03-30 15:00:03 +02:00
avio.h libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback 2014-03-26 23:58:48 +01:00
aviobuf.c Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' 2014-04-18 00:38:07 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
boadec.c
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c Enable muxing ac-3 in caf. 2014-04-24 18:02:20 +02:00
cavsvideodec.c
cdg.c
cdxl.c
cinedec.c avformat/cinedec: ask for sample when biBitCount isnt supported 2014-04-06 00:34:09 +02:00
concat.c
concatdec.c lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02:00
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file_open.c
file.c
filmstripdec.c
filmstripenc.c
flac_picture.c
flac_picture.h
flacdec.c avformat/flacdec/flac_read_timestamp: free the correct packet 2014-04-16 00:23:31 +02:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c Fix skiping typos 2014-04-27 14:50:14 +02:00
flvenc.c
format.c
framecrcenc.c
framehash.c
frmdec.c
ftp.c
g722.c
g723_1.c
g729dec.c
gif.c Force gif aspect ratio multiplication to 64bit. 2014-04-05 01:13:47 +02:00
gifdec.c
golomb_tab.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c avformat/h263dec: Fix h263 probe 2014-04-23 21:54:13 +02:00
h264dec.c
hdsenc.c
hevc.c
hevc.h
hevcdec.c
hls.c avformat/hls: reduce memory usage by using dynamically allocated url/key 2014-04-12 03:14:52 +03:00
hlsenc.c Merge commit '5a70a783f04919514efec7751d710b64d8975fd7' 2014-04-29 16:37:22 +02:00
hlsproto.c
hnm.c avformat/hnm: fix decoding of 256x256 video 2014-04-16 01:37:38 +02:00
http.c
http.h
httpauth.c
httpauth.h
icodec.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
icoenc.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
id3v1.c
id3v1.h
id3v2.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
id3v2.h ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks 2014-04-20 00:22:20 +02:00
ilbc.c
img2_alias_pix.c avformat/img2_alias_pix: fix 2 unused variable warnings 2014-04-29 18:47:27 +02:00
img2_brender_pix.c avformat: add image2 brender pix demuxer 2014-03-28 23:54:51 +01:00
img2.c OpenEXR decoder 2014-04-01 01:13:09 +02:00
img2.h avformat/img2dec: make image2dec capable to be used from seperate demuxers 2014-03-28 23:54:51 +01:00
img2dec.c avformat/img2dec: fix typo 2014-04-14 21:40:59 +02:00
img2enc.c Allow .y as extension for image2. 2014-04-05 02:18:09 +02:00
ingenientdec.c
internal.h Various small spelling fixes. 2014-04-22 20:44:31 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c Silicon Graphics RLE 8-bit video decoder 2014-04-19 16:24:26 +02:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c
libmodplug.c
libnut.c
libquvi.c
librtmp.c
libssh.c
lmlm4.c
loasdec.c
log2_tab.c
lvfdec.c
lxfdec.c
m4vdec.c
Makefile Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
matroska.c lavf/matroska: add "binary" pseudo-MIME type. 2014-04-29 13:25:59 +02:00
matroska.h
matroskadec.c Try mov tags if the fourcc in V_MS/VFW mkv files cannot be found in bmp tags. 2014-04-27 12:52:34 +02:00
matroskaenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c avformat/mlvdec: close any additional .Mxx files 2014-04-27 15:34:27 +02:00
mm.c
mmf.c
mms.c
mms.h
mmsh.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mmst.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mov_chan.c
mov_chan.h
mov.c avformat/mov: merge mov_read_custom_metadata() and mov_read_custom() 2014-04-10 21:25:51 +02:00
movenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
movenc.h
movenchint.c
mp3dec.c Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' 2014-04-18 00:38:07 +02:00
mp3enc.c avformat/mp3enc: drop redundant and uninitialized variable 2014-04-13 20:03:24 +02:00
mpc8.c
mpc.c
mpeg.c
mpeg.h lavf/mpeg.h: Remove an unused definition. 2014-04-27 14:54:29 +02:00
mpegenc.c avformat/mpegenc: try to improve the VBV buffer warning 2014-04-16 17:20:07 +02:00
mpegts.c avformat/mpegts: Remove redundant check 2014-04-16 02:35:50 +02:00
mpegts.h avformat/mpegtsenc: Allow DTS audio copy to TS streams 2014-04-27 14:24:29 +02:00
mpegtsenc.c avformat/mpegtsenc: Allow DTS audio copy to TS streams 2014-04-27 14:24:29 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c avformat/mux: Check for and remove invalid packet durations 2014-04-23 06:55:33 +02:00
mvdec.c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
mvi.c
mxf.c
mxf.h
mxfdec.c Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b' 2014-04-04 02:18:32 +02:00
mxfenc.c
mxg.c
ncdec.c
network.c avformat/network: use av_malloc_array() 2014-04-13 23:39:49 +02:00
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c avformat/nut: add ff_nut_audio_extra_tags to demuxer too 2014-04-09 23:37:55 +02:00
nut.h avformat/nut: add ff_nut_audio_extra_tags to demuxer too 2014-04-09 23:37:55 +02:00
nutdec.c avformat/nut: add ff_nut_audio_extra_tags to demuxer too 2014-04-09 23:37:55 +02:00
nutenc.c
nuv.c
oggdec.c Fix dont and doesnt typos 2014-04-27 15:14:32 +02:00
oggdec.h
oggenc.c oggenc: check return value of av_mallocz() 2014-04-04 15:56:52 +02:00
oggparsecelt.c avformat/oggparsecelt: fix memleak 2014-04-26 21:31:15 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
oggparsevp8.c
oma.c
oma.h
omadec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
omaenc.c
options_table.h
options.c
os_support.c
os_support.h
paf.c Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033' 2014-03-28 04:32:05 +01:00
pcm.c lavf/pcm: remove redundant check 2014-04-20 20:56:02 +02:00
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c avformat/pmpdec: remove cur_dts timestamp hack 2014-04-21 01:29:08 +02:00
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
redspark.c
replaygain.c avformat/replaygain: fix mixed declaration and statement 2014-04-18 01:16:27 +02:00
replaygain.h Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796' 2014-04-17 21:45:58 +02:00
riff.c Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 2014-04-23 20:47:13 +02:00
riff.h ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
riffdec.c
riffenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
rl2.c
rm.c
rm.h
rmdec.c
rmenc.c
rmsipr.c
rmsipr.h
rpl.c
rsd.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c avformat/rtmppkt: Fix random crash 2014-04-23 15:10:42 +02:00
rtmppkt.h
rtmpproto.c avformat/rtmpproto: Added handling of an initial RTMP chunk size packet. 2014-04-14 14:28:22 +02:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c
rtpdec_ilbc.c
rtpdec_jpeg.c
rtpdec_latm.c
rtpdec_mpeg4.c
rtpdec_mpeg12.c
rtpdec_mpegts.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
rtpdec.c
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c
rtpproto.h
rtsp.c
rtsp.h
rtspcodes.h lavf/rtspcodes: add missing header include 2014-04-10 21:57:04 +02:00
rtspdec.c rtspdec: check for strchr returning NULL. 2014-04-06 22:04:03 +02:00
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
sdr2.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c Merge commit '5c08ae4f37281441188447cd04dcaf7cd7ce031f' 2014-04-29 15:57:43 +02:00
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c
smush.c Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 2014-04-06 23:29:47 +02:00
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subfile.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c
takdec.c
tcp.c
tedcaptionsdec.c
tee.c avformat/tee: print errors for each failed bitstream filter 2014-04-26 21:08:44 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' 2014-04-22 13:30:23 +02:00
udp.c
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c avformat/utils: Set the average frame rate from the r_frame_rate if the stream appears to be cfr 2014-04-28 18:51:15 +02:00
vc1test.c
vc1testenc.c
version.h Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c avformat/wavdec: enlarge probe_packets for wav 2014-04-19 03:54:10 +02:00
wavenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
wc3movie.c
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER 2014-04-04 17:20:38 +02:00
wtvenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c avformat/xmv: use av_malloc_array() 2014-04-15 13:51:48 +02:00
xwma.c avformat/xwma: fix memleak of dpds_table 2014-04-29 20:48:03 +02:00
yop.c
yuv4mpeg.c