diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-02-25 12:00:31 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-02-25 12:00:31 +0000 |
| commit | e13c0783333a17ec2a14d6b283ea78cb506ec05d (patch) | |
| tree | 823462d2fa2163df595f9fd0f1eac00a30b42294 /libavformat | |
| parent | e0130159809dc6753f630d321ddd1d82409ae351 (diff) | |
set bps to uncompressed original sound data for compressed audio
according to aiff specs, qt set it to 16 for mace and ima4,
fail if block align is not set.
Originally committed as revision 12198 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/aiff.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/aiff.c b/libavformat/aiff.c index dede1d6fe4..4a574644a7 100644 --- a/libavformat/aiff.c +++ b/libavformat/aiff.c @@ -189,7 +189,12 @@ static int aiff_write_header(AVFormatContext *s) put_be32(pb, 0); /* file length */ put_tag(pb, aifc ? "AIFC" : "AIFF"); - if (aifc) { + if (aifc) { // compressed audio + enc->bits_per_sample = 16; + if (!enc->block_align) { + av_log(s, AV_LOG_ERROR, "block align not set\n"); + return -1; + } /* Version chunk */ put_tag(pb, "FVER"); put_be32(pb, 4); |