mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
5e7d21c7ad
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>
54 lines
2.4 KiB
Plaintext
54 lines
2.4 KiB
Plaintext
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
|
ret:-EOF
|
|
ret: 0 st: 0 flags:0 ts: 0.788345
|
|
ret: 0 st: 0 flags:1 dts: 0.788345 pts: 0.788345 pos: 69606 size: 4096
|
|
ret: 0 st: 0 flags:1 ts:-0.317506
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st:-1 flags:0 ts: 2.576668
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:1 ts: 1.470835
|
|
ret:-EOF
|
|
ret: 0 st: 0 flags:0 ts: 0.365011
|
|
ret: 0 st: 0 flags:1 dts: 0.365011 pts: 0.365011 pos: 32268 size: 4096
|
|
ret: 0 st: 0 flags:1 ts:-0.740839
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st:-1 flags:0 ts: 2.153336
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:1 ts: 1.047503
|
|
ret:-EOF
|
|
ret: 0 st: 0 flags:0 ts:-0.058322
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st: 0 flags:1 ts: 2.835828
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:0 ts: 1.730004
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 0 flags:1 dts: 0.624172 pts: 0.624172 pos: 55126 size: 4096
|
|
ret: 0 st: 0 flags:0 ts:-0.481655
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st: 0 flags:1 ts: 2.412494
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:0 ts: 1.306672
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:1 ts: 0.200839
|
|
ret: 0 st: 0 flags:1 dts: 0.200839 pts: 0.200839 pos: 17788 size: 4096
|
|
ret: 0 st: 0 flags:0 ts:-0.904989
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st: 0 flags:1 ts: 1.989184
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:0 ts: 0.883340
|
|
ret: 0 st: 0 flags:1 dts: 0.883333 pts: 0.883333 pos: 77984 size: 4096
|
|
ret: 0 st:-1 flags:1 ts:-0.222493
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|
|
ret: 0 st: 0 flags:0 ts: 2.671678
|
|
ret:-EOF
|
|
ret: 0 st: 0 flags:1 ts: 1.565850
|
|
ret:-EOF
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 0 flags:1 dts: 0.460000 pts: 0.460000 pos: 40646 size: 4096
|
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
|
ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 74 size: 4096
|