aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-24 17:22:39 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-24 17:22:39 +0000
commit287d6cfad7fb4d0fd1d373a9ebc81f280ab8c1ca (patch)
treefb2045ca5dd8ff91fec23ae2d229f05f26521ee3
parent3f78a3a95535b21e32abc93f55b61ceecbbc8ee1 (diff)
downloadffmpeg-287d6cfad7fb4d0fd1d373a9ebc81f280ab8c1ca.tar.gz
cosmetics: remove useless whitespaces and put braces correctly
Originally committed as revision 12942 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/movenc.c24
1 files changed, 11 insertions, 13 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 08070fca3b..b5b4da95f5 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -258,15 +258,15 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
offset_t pos = url_ftell(pb);
int decoderSpecificInfoLen = track->vosLen ? descrLength(track->vosLen):0;
- put_be32(pb, 0); // size
+ put_be32(pb, 0); // size
put_tag(pb, "esds");
- put_be32(pb, 0); // Version
+ put_be32(pb, 0); // Version
// ES descriptor
putDescr(pb, 0x03, 3 + descrLength(13 + decoderSpecificInfoLen) +
descrLength(1));
put_be16(pb, track->trackID);
- put_byte(pb, 0x00); // flags (= no flags)
+ put_byte(pb, 0x00); // flags (= no flags)
// DecoderConfig descriptor
putDescr(pb, 0x04, 13 + decoderSpecificInfoLen);
@@ -277,27 +277,25 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
// the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio)
// plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)
if(track->enc->codec_type == CODEC_TYPE_AUDIO)
- put_byte(pb, 0x15); // flags (= Audiostream)
+ put_byte(pb, 0x15); // flags (= Audiostream)
else
- put_byte(pb, 0x11); // flags (= Visualstream)
+ put_byte(pb, 0x11); // flags (= Visualstream)
- put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits)
- put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
+ put_byte(pb, track->enc->rc_buffer_size>>(3+16)); // Buffersize DB (24 bits)
+ put_be16(pb, (track->enc->rc_buffer_size>>3)&0xFFFF); // Buffersize DB
- put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window)
+ put_be32(pb, FFMAX(track->enc->bit_rate, track->enc->rc_max_rate)); // maxbitrate (FIXME should be max rate in any 1 sec window)
if(track->enc->rc_max_rate != track->enc->rc_min_rate || track->enc->rc_min_rate==0)
- put_be32(pb, 0); // vbr
+ put_be32(pb, 0); // vbr
else
- put_be32(pb, track->enc->rc_max_rate); // avg bitrate
+ put_be32(pb, track->enc->rc_max_rate); // avg bitrate
- if (track->vosLen)
- {
+ if (track->vosLen) {
// DecoderSpecific info descriptor
putDescr(pb, 0x05, track->vosLen);
put_buffer(pb, track->vosData, track->vosLen);
}
-
// SL descriptor
putDescr(pb, 0x06, 1);
put_byte(pb, 0x02);