summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-03-04 01:56:27 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2007-03-04 01:56:27 +0000
commit10fc840c52c8f7458b187d83f275f1c3dd61645d (patch)
treea93da9d4d5b663d94366003eb04c114da9783c0d /libavformat/movenc.c
parent2260499caf9f64f39e745d7aeb2c32a0f2cf93fd (diff)
fix pcm u/s8 muxing
Originally committed as revision 8213 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index ec5d1675e0..09bea76f41 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -343,7 +343,11 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
if (track->mode == MODE_MOV) {
put_be16(pb, track->enc->channels);
- put_be16(pb, 16); /* FIXME 8 bit for 'raw ' in mov */
+ if (track->enc->codec_id == CODEC_ID_PCM_U8 ||
+ track->enc->codec_id == CODEC_ID_PCM_S8)
+ put_be16(pb, 8); /* bits per sample */
+ else
+ put_be16(pb, 16);
put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */
} else { /* reserved for mp4/3gp */
put_be16(pb, 2);