diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2014-04-29 19:26:05 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 16:41:35 +0200 |
| commit | 5e7d21c7ad02e37caa1bcb50ab8ad64e7d7fb86c (patch) | |
| tree | 20eb13371083ec6c50fe3533141c240f51780624 /libavformat/wtvenc.c | |
| parent | bb6d00f01417718315d7944c6c33950ea88fb287 (diff) | |
ff_put_wav_header: add flag to force WAVEFORMATEX
Partially undoes commit 2c4e08d89327595f7f4be57dda4b3775e1198d5e:
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>
Diffstat (limited to 'libavformat/wtvenc.c')
| -rw-r--r-- | libavformat/wtvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index f051c660ba..634545d459 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -289,7 +289,7 @@ static int write_stream_codec_info(AVFormatContext *s, AVStream *st) if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) { put_videoinfoheader2(pb, st); } else { - if (ff_put_wav_header(pb, st->codec) < 0) + if (ff_put_wav_header(pb, st->codec, 0) < 0) format_type = &ff_format_none; } hdr_size = avio_tell(pb) - hdr_pos_start; |