[FFmpeg-devel] [PATCH] ff_put_wav_header: add flag to force WAVEFORMATEX

Michael Niedermayer michaelni at gmx.at
Tue Apr 29 20:28:09 CEST 2014

On Mon, Apr 28, 2014 at 08:18:41PM -0700, Daniel Verkamp wrote:
> 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.

this still breaks one test

make fate-filter-channelmap-one-str
TEST    filter-channelmap-one-str
--- -   2014-04-29 20:26:58.481206735 +0200
+++ tests/data/fate/filter-channelmap-one-str   2014-04-29 20:26:58.476424967 +0200
@@ -1 +1 @@
Test filter-channelmap-one-str failed. Look at tests/data/fate/filter-channelmap-one-str.err for details.
make: *** [fate-filter-channelmap-one-str] Error 1

Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Opposition brings concord. Out of discord comes the fairest harmony.
-- Heraclitus
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140429/4c46f448/attachment.asc>

More information about the ffmpeg-devel mailing list