highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cosmetics, reindent after last commit

Browse Source 
Originally committed as revision 20648 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2009-11-29 02:04:44 +00:00
parent feaa8d110d
commit ba7c0ece61
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavformat/movenc.c
View File

@ -475,23 +475,23 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack *track)
put_be32(pb, track->sampleSize); put_be32(pb, track->sampleSize);
put_be32(pb, track->enc->frame_size); put_be32(pb, track->enc->frame_size);
} else { } else {
if (track->mode == MODE_MOV) { if (track->mode == MODE_MOV) {
put_be16(pb, track->enc->channels); put_be16(pb, track->enc->channels);
if (track->enc->codec_id == CODEC_ID_PCM_U8 || if (track->enc->codec_id == CODEC_ID_PCM_U8 ||
track->enc->codec_id == CODEC_ID_PCM_S8) track->enc->codec_id == CODEC_ID_PCM_S8)
put_be16(pb, 8); /* bits per sample */ put_be16(pb, 8); /* bits per sample */
else else
put_be16(pb, 16);
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, 16);
put_be16(pb, track->audio_vbr ? -2 : 0); /* compression ID */ put_be16(pb, 0);
} else { /* reserved for mp4/3gp */ }
put_be16(pb, 2);
put_be16(pb, 16);
put_be16(pb, 0);
}
put_be16(pb, 0); /* packet size (= 0) */ put_be16(pb, 0); /* packet size (= 0) */
put_be16(pb, track->timescale); /* Time scale */ put_be16(pb, track->timescale); /* Time scale */
put_be16(pb, 0); /* Reserved */ put_be16(pb, 0); /* Reserved */
} }
if(version == 1) { /* SoundDescription V1 extended info */ if(version == 1) { /* SoundDescription V1 extended info */
@ -1850,9 +1850,9 @@ static int mov_write_header(AVFormatContext *s)
goto error; goto error;
} }
if (track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) { if (track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) {
av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n", av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n",
i, track->enc->sample_rate); i, track->enc->sample_rate);
goto error; goto error;
} }
} }
}else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){ }else if(st->codec->codec_type == CODEC_TYPE_SUBTITLE){