aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Bandurski <ami_stuff@o2.pl>2012-12-12 21:51:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-20 16:05:30 +0100
commit52f21763667c1fe88581f978304b18c67dbe1e0e (patch)
tree540b0c1acff6279d8f38b421340dd8043d310321
parent0146c1f0f173417b2b90f35a2fdf87604cf9227a (diff)
downloadffmpeg-52f21763667c1fe88581f978304b18c67dbe1e0e.tar.gz
aiffenc: set correct number of bits foru8 in aiff
with this change QuickTime is able to play u8 aiff file generated by FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/aiffenc.c1
-rw-r--r--tests/ref/acodec/adpcm-ima_qt2
2 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index 8cdb2616c2..ba5f607ff8 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -53,7 +53,6 @@ static int aiff_write_header(AVFormatContext *s)
ffio_wfourcc(pb, aifc ? "AIFC" : "AIFF");
if (aifc) { // compressed audio
- enc->bits_per_coded_sample = 16;
if (!enc->block_align) {
av_log(s, AV_LOG_ERROR, "block align not set\n");
return -1;
diff --git a/tests/ref/acodec/adpcm-ima_qt b/tests/ref/acodec/adpcm-ima_qt
index 80015275fc..ace5325dc1 100644
--- a/tests/ref/acodec/adpcm-ima_qt
+++ b/tests/ref/acodec/adpcm-ima_qt
@@ -1,4 +1,4 @@
-23cbae1182e150ebf28e0abfb9cba127 *tests/data/fate/acodec-adpcm-ima_qt.aiff
+44691f14cf5bbef5005df27c692b93ab *tests/data/fate/acodec-adpcm-ima_qt.aiff
281252 tests/data/fate/acodec-adpcm-ima_qt.aiff
b0fafd002c38fb70acaddfda1a31ed61 *tests/data/fate/acodec-adpcm-ima_qt.out.wav
stddev: 904.76 PSNR: 37.20 MAXDIFF:34029 bytes: 1058400/ 1058560