diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-03-04 01:48:06 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2007-03-04 01:48:06 +0000 |
| commit | 2260499caf9f64f39e745d7aeb2c32a0f2cf93fd (patch) | |
| tree | 1b2424fd9715825f6f63742adab220a3872e93d2 /libavformat/movenc.c | |
| parent | 56c70e1d3a1cde2f7490780a4924e6b6e87e4c47 (diff) | |
deobfuscate, clearly split mov case
Originally committed as revision 8212 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 9b7ee7aec8..ec5d1675e0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -341,11 +341,16 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track) put_be16(pb, 0); /* Revision level */ put_be32(pb, 0); /* Reserved */ - put_be16(pb, track->mode == MODE_MOV ? track->enc->channels : 2); /* Number of channels */ - /* FIXME 8 bit for 'raw ' in mov */ - put_be16(pb, 16); /* Reserved */ + if (track->mode == MODE_MOV) { + put_be16(pb, track->enc->channels); + put_be16(pb, 16); /* FIXME 8 bit for 'raw ' in mov */ + put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ + } else { /* reserved for mp4/3gp */ + put_be16(pb, 2); + put_be16(pb, 16); + put_be16(pb, 0); + } - put_be16(pb, track->mode == MODE_MOV && track->audio_vbr ? -2 : 0); /* compression ID */ put_be16(pb, 0); /* packet size (= 0) */ put_be16(pb, track->timescale); /* Time scale */ put_be16(pb, 0); /* Reserved */ |