eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ff_put_wav_header: add flag to force WAVEFORMATEX

Browse source 
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>
This commit is contained in:
Daniel Verkamp 2014-04-29 19:26:05 -07:00 • committed by Michael Niedermayer
parent bb6d00f014
commit 5e7d21c7ad
54 changed files with 148 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavformat/avienc.c
View file

@ -325,7 +325,7 @@ static int avi_write_header(AVFormatContext *s)
av_get_pix_fmt_name(stream->pix_fmt));
break;
case AVMEDIA_TYPE_AUDIO:
if ((ret = ff_put_wav_header(pb, stream)) < 0)
if ((ret = ff_put_wav_header(pb, stream, 0)) < 0)
return ret;
break;
default: