diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-16 12:14:25 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-04-17 00:09:19 -0400 |
| commit | 8099fc763bb071ba56e3de49a2104c57985fa3d1 (patch) | |
| tree | 3c28e16dbfe13c7d0d3b4b2a4c1244e7dfb65289 | |
| parent | b1041f80489b3fe428ef586e6d631fda40bef80e (diff) | |
| download | ffmpeg-8099fc763bb071ba56e3de49a2104c57985fa3d1.tar.gz | |
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
This matches the value for the plain WAVEFORMATEX header.
Also fixes stream copy to WAVE for non-16-bit raw pcm.
| -rw-r--r-- | libavformat/riff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 2b6165e990..8a913452a7 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -482,7 +482,7 @@ int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc) if(waveformatextensible) { /* write WAVEFORMATEXTENSIBLE extensions */ hdrsize += 22; avio_wl16(pb, riff_extradata - riff_extradata_start + 22); /* 22 is WAVEFORMATEXTENSIBLE size */ - avio_wl16(pb, enc->bits_per_coded_sample); /* ValidBitsPerSample || SamplesPerBlock || Reserved */ + avio_wl16(pb, bps); /* ValidBitsPerSample || SamplesPerBlock || Reserved */ avio_wl32(pb, enc->channel_layout); /* dwChannelMask */ avio_wl32(pb, enc->codec_tag); /* GUID + next 3 */ avio_wl32(pb, 0x00100000); |