From 5e7d21c7ad02e37caa1bcb50ab8ad64e7d7fb86c Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 29 Apr 2014 19:26:05 -0700 Subject: 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 --- tests/ref/acodec/pcm-u16be | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/ref/acodec/pcm-u16be') diff --git a/tests/ref/acodec/pcm-u16be b/tests/ref/acodec/pcm-u16be index 0214975..4e758d7 100644 --- a/tests/ref/acodec/pcm-u16be +++ b/tests/ref/acodec/pcm-u16be @@ -1,4 +1,4 @@ eab6206a2cec3c5a3be47fdaa826faff *tests/data/fate/acodec-pcm-u16be.nut 1060673 tests/data/fate/acodec-pcm-u16be.nut -64151e4bcc2b717aa5a8454d424d6a1f *tests/data/fate/acodec-pcm-u16be.out.wav +95e54b261530a1bcf6de6fe3b21dc5f6 *tests/data/fate/acodec-pcm-u16be.out.wav stddev: 0.00 PSNR:999.99 MAXDIFF: 0 bytes: 1058400/ 1058400 -- cgit v1.1